You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/03/07 23:27:55 UTC
svn commit: r1298169 - in /lucene/dev/branches/branch_3x: ./
dev-tools/eclipse/ solr/ solr/core/
solr/core/src/java/org/apache/solr/handler/
solr/core/src/java/org/apache/solr/response/ solr/lib/
Author: uschindler
Date: Wed Mar 7 22:27:54 2012
New Revision: 1298169
URL: http://svn.apache.org/viewvc?rev=1298169&view=rev
Log:
Merged revision(s) 1298164 from lucene/dev/trunk:
SOLR-3204: The packaged pre-release artifact of Commons CSV used the original package name (org.apache.commons.csv). This created a compatibility issue as the Apache Commons team works toward an official release of Commons CSV. JARJAR (http://code.google.com/p/jarjar/) was used to change the package name to org.apache.solr.internal.csv
Added:
lucene/dev/branches/branch_3x/solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar
- copied unchanged from r1298164, lucene/dev/trunk/solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar
lucene/dev/branches/branch_3x/solr/lib/apache-solr-commons-csv-LICENSE-ASL.txt
- copied unchanged from r1298164, lucene/dev/trunk/solr/lib/apache-solr-commons-csv-LICENSE-ASL.txt
lucene/dev/branches/branch_3x/solr/lib/apache-solr-commons-csv-NOTICE.txt
- copied unchanged from r1298164, lucene/dev/trunk/solr/lib/apache-solr-commons-csv-NOTICE.txt
lucene/dev/branches/branch_3x/solr/lib/apache-solr-commons-csv-pom.xml.template
- copied unchanged from r1298164, lucene/dev/trunk/solr/lib/apache-solr-commons-csv-pom.xml.template
Removed:
lucene/dev/branches/branch_3x/solr/lib/commons-csv-1.0-SNAPSHOT-r966014.jar
lucene/dev/branches/branch_3x/solr/lib/commons-csv-LICENSE-ASL.txt
lucene/dev/branches/branch_3x/solr/lib/commons-csv-NOTICE.txt
lucene/dev/branches/branch_3x/solr/lib/solr-commons-csv-pom.xml.template
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/ (props changed)
lucene/dev/branches/branch_3x/solr/core/build.xml
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1298169&r1=1298168&r2=1298169&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Wed Mar 7 22:27:54 2012
@@ -97,7 +97,7 @@
<classpathentry kind="lib" path="lucene/contrib/icu/lib/icu4j-4_8_1_1.jar"/>
<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1099557.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-csv-1.0-SNAPSHOT-r966014.jar"/>
+ <classpathentry kind="lib" path="solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1298169&r1=1298168&r2=1298169&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Wed Mar 7 22:27:54 2012
@@ -228,6 +228,12 @@ Bug Fixes
* SOLR-3009: hitGrouped.vm isn't shipped with 3.x (ehatcher, janhoy)
+* SOLR-3204: The packaged pre-release artifact of Commons CSV used the original
+ package name (org.apache.commons.csv). This created a compatibility issue as
+ the Apache Commons team works toward an official release of Commons CSV.
+ JARJAR (http://code.google.com/p/jarjar/) was used to change the package name
+ to org.apache.solr.internal.csv. (Uwe Schindler, Emmanuel Bourg)
+
Other Changes
----------------------
* SOLR-2922: Upgrade commons-io and commons-lang to 2.1 and 2.6, respectively. (koji)
Modified: lucene/dev/branches/branch_3x/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/build.xml?rev=1298169&r1=1298168&r2=1298169&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/build.xml Wed Mar 7 22:27:54 2012
@@ -23,8 +23,8 @@
<target name="compile-core" depends="compile-solrj,common-solr.compile-core"/>
<target name="dist-maven" depends="jar-core,javadocs,jar-src,common.dist-maven">
- <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/solr-commons-csv-pom.xml.template"
- jar.file="${common-solr.dir}/lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
+ <m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/apache-solr-commons-csv-pom.xml.template"
+ jar.file="${common-solr.dir}/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar" />
<m2-deploy-with-pom-template pom.xml="${common-solr.dir}/lib/apache-solr-noggit-pom.xml.template"
jar.file="${common-solr.dir}/lib/apache-solr-noggit-r1099557.jar" />
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java?rev=1298169&r1=1298168&r2=1298169&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java Wed Mar 7 22:27:54 2012
@@ -29,8 +29,8 @@ import org.apache.solr.schema.IndexSchem
import org.apache.solr.schema.SchemaField;
import org.apache.solr.update.*;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-import org.apache.commons.csv.CSVStrategy;
-import org.apache.commons.csv.CSVParser;
+import org.apache.solr.internal.csv.CSVStrategy;
+import org.apache.solr.internal.csv.CSVParser;
import org.apache.commons.io.IOUtils;
import java.util.regex.Pattern;
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java?rev=1298169&r1=1298168&r2=1298169&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java Wed Mar 7 22:27:54 2012
@@ -17,8 +17,8 @@
package org.apache.solr.response;
-import org.apache.commons.csv.CSVPrinter;
-import org.apache.commons.csv.CSVStrategy;
+import org.apache.solr.internal.csv.CSVPrinter;
+import org.apache.solr.internal.csv.CSVStrategy;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
import org.apache.solr.common.SolrDocument;