svn commit: r1579406 - in /lucene/dev/branches/lucene_solr_4_7: ./ lucene/ lucene/benchmark/ lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ lucene/join/ lucene/join/src/test/org/apache/lucene/search/join/ lucene/misc/ lucene/misc/s...

[us...@apache.org]

Author: uschindler
Date: Wed Mar 19 21:21:58 2014
New Revision: 1579406

URL: http://svn.apache.org/r1579406
Log:
Merged revision(s) 1579402 from lucene/dev/branches/branch_4x:
Merged revision(s) 1579399 from lucene/dev/trunk:
LUCENE-5540: Update forbidden-apis, pegdown, groovy

Modified:
    lucene/dev/branches/lucene_solr_4_7/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/benchmark/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java
    lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml   (contents, props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/join/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
    lucene/dev/branches/lucene_solr_4_7/lucene/misc/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java
    lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
    lucene/dev/branches/lucene_solr_4_7/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/contrib/   (props changed)
    lucene/dev/branches/lucene_solr_4_7/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
    lucene/dev/branches/lucene_solr_4_7/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java

Modified: lucene/dev/branches/lucene_solr_4_7/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java?rev=1579406&r1=1579405&r2=1579406&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java Wed Mar 19 21:21:58 2014
@@ -65,7 +65,7 @@ public class NewLocaleTask extends PerfT
     getRunData().setLocale(locale);
     System.out.println("Changed Locale to: " + 
         (locale == null ? "null" : 
-        (locale.getDisplayName().length() == 0) ? "root locale" : locale));
+        (locale.getDisplayName(Locale.ENGLISH).length() == 0) ? "root locale" : locale));
     return 1;
   }
   

Modified: lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml?rev=1579406&r1=1579405&r2=1579406&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/common-build.xml Wed Mar 19 21:21:58 2014
@@ -2183,7 +2183,7 @@ ${ant.project.name}.test.dependencies=${
 
   <!-- GROOVY scripting engine for ANT tasks -->
   <target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure">
-    <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.2.1"
+    <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.2.2"
       inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/>
     <taskdef name="groovy"
       classname="org.codehaus.groovy.ant.Groovy"
@@ -2197,7 +2197,7 @@ ${ant.project.name}.test.dependencies=${
   <property name="forbidden-sysout-excludes" value=""/>
   
   <target name="-install-forbidden-apis" unless="forbidden-apis.loaded" depends="ivy-availability-check,ivy-configure">
-    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="1.4"
+    <ivy:cachepath organisation="de.thetaphi" module="forbiddenapis" revision="1.4.1"
       inline="true" conf="default" transitive="true" pathid="forbidden-apis.classpath"/>
     <taskdef name="forbidden-apis" classname="de.thetaphi.forbiddenapis.AntTask" classpathref="forbidden-apis.classpath"/>
     <property name="forbidden-apis.loaded" value="true"/>
@@ -2241,7 +2241,7 @@ ${ant.project.name}.test.dependencies=${
   <!-- PEGDOWN macro: Before using depend on the target "resolve-pegdown,resolve-groovy" -->
   
   <target name="resolve-pegdown" unless="pegdown.loaded" depends="ivy-availability-check,ivy-configure">
-    <ivy:cachepath organisation="org.pegdown" module="pegdown" revision="1.4.1"
+    <ivy:cachepath organisation="org.pegdown" module="pegdown" revision="1.4.2"
       inline="true" conf="default" transitive="true" pathid="pegdown.classpath"/>
     <property name="pegdown.loaded" value="true"/>
   </target>

Modified: lucene/dev/branches/lucene_solr_4_7/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1579406&r1=1579405&r2=1579406&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Wed Mar 19 21:21:58 2014
@@ -353,8 +353,8 @@ public class TestJoinUtil extends Lucene
         assertEquals(expectedTopDocs.getMaxScore(), actualTopDocs.getMaxScore(), 0.0f);
         for (int i = 0; i < expectedTopDocs.scoreDocs.length; i++) {
           if (VERBOSE) {
-            System.out.printf("Expected doc: %d | Actual doc: %d\n", expectedTopDocs.scoreDocs[i].doc, actualTopDocs.scoreDocs[i].doc);
-            System.out.printf("Expected score: %f | Actual score: %f\n", expectedTopDocs.scoreDocs[i].score, actualTopDocs.scoreDocs[i].score);
+            System.out.printf(Locale.ENGLISH, "Expected doc: %d | Actual doc: %d\n", expectedTopDocs.scoreDocs[i].doc, actualTopDocs.scoreDocs[i].doc);
+            System.out.printf(Locale.ENGLISH, "Expected score: %f | Actual score: %f\n", expectedTopDocs.scoreDocs[i].score, actualTopDocs.scoreDocs[i].score);
           }
           assertEquals(expectedTopDocs.scoreDocs[i].doc, actualTopDocs.scoreDocs[i].doc);
           assertEquals(expectedTopDocs.scoreDocs[i].score, actualTopDocs.scoreDocs[i].score, 0.0f);

Modified: lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java?rev=1579406&r1=1579405&r2=1579406&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java Wed Mar 19 21:21:58 2014
@@ -18,6 +18,7 @@ package org.apache.lucene.misc;
  */
 
 import java.io.File;
+import java.util.Locale;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.index.DirectoryReader;
@@ -49,7 +50,7 @@ public class GetTermInfo {
   
   public static void getTermInfo(Directory dir, Term term) throws Exception {
     IndexReader reader = DirectoryReader.open(dir);
-    System.out.printf("%s:%s \t totalTF = %,d \t doc freq = %,d \n",
+    System.out.printf(Locale.ROOT, "%s:%s \t totalTF = %,d \t doc freq = %,d \n",
          term.field(), term.text(), reader.totalTermFreq(term), reader.docFreq(term)); 
   }
    

Modified: lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java?rev=1579406&r1=1579405&r2=1579406&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java Wed Mar 19 21:21:58 2014
@@ -31,6 +31,7 @@ import org.apache.lucene.util.BytesRef;
 import java.io.File;
 import java.io.IOException;
 import java.util.Comparator;
+import java.util.Locale;
 
 /**
  * <code>HighFreqTerms</code> class extracts the top n most frequent terms
@@ -76,7 +77,7 @@ public class HighFreqTerms {
     TermStats[] terms = getHighFreqTerms(reader, numTerms, field, comparator);
 
     for (int i = 0; i < terms.length; i++) {
-      System.out.printf("%s:%s \t totalTF = %,d \t docFreq = %,d \n",
+      System.out.printf(Locale.ROOT, "%s:%s \t totalTF = %,d \t docFreq = %,d \n",
             terms[i].field, terms[i].termtext.utf8ToString(), terms[i].totalTermFreq, terms[i].docFreq);
     }
     reader.close();

Modified: lucene/dev/branches/lucene_solr_4_7/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java?rev=1579406&r1=1579405&r2=1579406&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java Wed Mar 19 21:21:58 2014
@@ -90,7 +90,7 @@ public class SimplePropertiesWriter exte
     if(params.get(LOCALE) != null) {
       String localeStr = params.get(LOCALE);
       for (Locale l : Locale.getAvailableLocales()) {
-        if(localeStr.equals(l.getDisplayName())) {
+        if(localeStr.equals(l.getDisplayName(Locale.ROOT))) {
           locale = l;
           break;
         }

Modified: lucene/dev/branches/lucene_solr_4_7/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_7/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java?rev=1579406&r1=1579405&r2=1579406&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_7/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_7/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/SolrRecordWriter.java Wed Mar 19 21:21:58 2014
@@ -237,7 +237,7 @@ class SolrRecordWriter<K, V> extends Rec
         } catch (InterruptedException e) {
           exitValue = "interrupted";
         }
-        System.err.format("Exit value of 'ls -lR' is %s%n", exitValue);
+        System.err.format(Locale.ENGLISH, "Exit value of 'ls -lR' is %s%n", exitValue);
       }
       if (unpackedDir.getName().equals(SolrOutputFormat.getZipName(conf))) {
         LOG.info("Using this unpacked directory as solr home: {}", unpackedDir);