Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1298164 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2012-03-07 22:22:00 +00:00
parent 1242fb0437
commit 7ef0b53961
10 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-tools/eclipse/dot.classpath
View File

@ -100,7 +100,7 @@
<classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.2.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1211150.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"/>

6
solr/CHANGES.txt
View File

@ -642,6 +642,12 @@ Bug Fixes
* SOLR-3195: timeAllowed is ignored for grouping queries
(Russell Black via Martijn van Groningen)
* 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)

4
solr/core/build.xml
View File

@ -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-r1211150.jar" />

4
solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java
View File

@ -29,8 +29,8 @@ import org.apache.solr.schema.IndexSchema;
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;

4
solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java
View File

@ -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.index.IndexableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;

2
solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar Normal file
View File

@ -0,0 +1,2 @@
AnyObjectId[bab8b31fb99256e13fc6010701db560243c47fa7] was removed in git history.
Apache SVN contains full history.

0
solr/lib/commons-csv-LICENSE-ASL.txt → solr/lib/apache-solr-commons-csv-LICENSE-ASL.txt
View File

4
solr/lib/commons-csv-NOTICE.txt → solr/lib/apache-solr-commons-csv-NOTICE.txt
View File

@ -3,3 +3,7 @@ Copyright 2005-2006 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
This JAR artifact contains a pre-release version of
Apache Commons CSV, that was jarjar'ed to have a Solr
private package name. Don't use it outside of Solr.

0
solr/lib/solr-commons-csv-pom.xml.template → solr/lib/apache-solr-commons-csv-pom.xml.template
View File

2
solr/lib/commons-csv-1.0-SNAPSHOT-r966014.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[8439e6f1a8b1d82943f84688b8086869255eda86] was removed in git history.
Apache SVN contains full history.