You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/09/04 17:51:32 UTC

svn commit: r1380696 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/eclipse/ dev-tools/maven/ lucene/ lucene/benchmark/ lucene/licenses/

Author: rmuir
Date: Tue Sep  4 15:51:32 2012
New Revision: 1380696

URL: http://svn.apache.org/viewvc?rev=1380696&view=rev
Log:
LUCENE-4356: settle on one version of commons-compress

Added:
    lucene/dev/branches/branch_4x/lucene/licenses/commons-compress-1.4.1.jar.sha1
      - copied unchanged from r1380683, lucene/dev/trunk/lucene/licenses/commons-compress-1.4.1.jar.sha1
Removed:
    lucene/dev/branches/branch_4x/lucene/licenses/commons-compress-1.3.jar.sha1
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
    lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/benchmark/   (props changed)
    lucene/dev/branches/branch_4x/lucene/benchmark/build.xml
    lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml
    lucene/dev/branches/branch_4x/lucene/licenses/   (props changed)

Modified: lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath?rev=1380696&r1=1380695&r2=1380696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.classpath Tue Sep  4 15:51:32 2012
@@ -102,7 +102,7 @@
 	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
 	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
 	<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
-	<classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.3.jar"/>
+	<classpathentry kind="lib" path="lucene/benchmark/lib/commons-compress-1.4.1.jar"/>
 	<classpathentry kind="lib" path="lucene/benchmark/lib/xercesImpl-2.9.1.jar"/>
 	<classpathentry kind="lib" path="lucene/benchmark/lib/nekohtml-1.9.15.jar"/>
 	<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
@@ -166,7 +166,6 @@
   <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.0.rc5.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar"/>
-  <classpathentry kind="lib" path="solr/contrib/extraction/lib/commons-compress-1.4.1.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.7.0.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/icu4j-49.1.jar"/>
   <classpathentry kind="lib" path="solr/contrib/extraction/lib/isoparser-1.0-RC-1.jar"/>

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template?rev=1380696&r1=1380695&r2=1380696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/pom.xml.template Tue Sep  4 15:51:32 2012
@@ -230,7 +230,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.2</version>
+        <version>1.4.1</version>
       </dependency>
       <dependency>
         <groupId>net.arnx</groupId>

Modified: lucene/dev/branches/branch_4x/lucene/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/build.xml?rev=1380696&r1=1380695&r2=1380696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/build.xml Tue Sep  4 15:51:32 2012
@@ -153,7 +153,7 @@
       <fileset dir="${common.dir}/analysis/icu/lib" includes="icu4j-49.1.jar"/>
       <path refid="base.classpath"/>
     	<fileset dir="lib">
-    	  <include name="commons-compress-1.3.jar"/>
+    	  <include name="commons-compress-1.4.1.jar"/>
     	  <include name="xercesImpl-2.9.1.jar"/>
     	  <include name="nekohtml-1.9.15.jar"/>
     	</fileset>

Modified: lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml?rev=1380696&r1=1380695&r2=1380696&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/ivy.xml Tue Sep  4 15:51:32 2012
@@ -19,7 +19,7 @@
 <ivy-module version="2.0">
     <info organisation="org.apache.lucene" module="benchmark"/>
     <dependencies>
-      <dependency org="org.apache.commons" name="commons-compress" rev="1.3" transitive="false"/>
+      <dependency org="org.apache.commons" name="commons-compress" rev="1.4.1" transitive="false"/>
       <dependency org="xerces" name="xercesImpl" rev="2.9.1" transitive="false"/>
       <dependency org="net.sourceforge.nekohtml" name="nekohtml" rev="1.9.15" transitive="false"/>
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>