You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2012/03/30 01:27:45 UTC
svn commit: r1307165 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/maven/ dev-tools/maven/modules/benchmark/ lucene/tools/
modules/benchmark/ solr/
Author: sarowe
Date: Thu Mar 29 23:27:45 2012
New Revision: 1307165
URL: http://svn.apache.org/viewvc?rev=1307165&view=rev
Log:
LUCENE-3937: Removed remaining references to the patched xercesImpl jar; added benchmark/CHANGES.txt entry.
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/lucene/tools/custom-tasks.xml
lucene/dev/trunk/modules/benchmark/CHANGES.txt
lucene/dev/trunk/modules/benchmark/NOTICE.txt
lucene/dev/trunk/modules/benchmark/build.xml
lucene/dev/trunk/solr/NOTICE.txt
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Thu Mar 29 23:27:45 2012
@@ -100,7 +100,7 @@
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar"/>
<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="modules/benchmark/lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1211150.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"/>
Modified: lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template Thu Mar 29 23:27:45 2012
@@ -85,11 +85,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</dependency>
@@ -97,6 +92,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Thu Mar 29 23:27:45 2012
@@ -360,6 +360,11 @@
<artifactId>spatial4j</artifactId>
<version>0.2</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -632,20 +637,6 @@
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
- <id>install-xercesImpl</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-solr-commons-csv</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/trunk/lucene/tools/custom-tasks.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/custom-tasks.xml?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/custom-tasks.xml (original)
+++ lucene/dev/trunk/lucene/tools/custom-tasks.xml Thu Mar 29 23:27:45 2012
@@ -44,8 +44,7 @@
<!-- Non-typical version patterns. -->
<additional-filters />
- <replaceregex pattern="/xercesImpl([^/]+)$" replace="/xercesImpl" flags="gi" />
-
+
<!-- Typical version patterns. -->
<replaceregex pattern="\-(r)?([0-9\-\_\.])+(b(eta)?([0-9\-\.])*)?$" replace="" flags="gi" />
</filtermapper>
Modified: lucene/dev/trunk/modules/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/CHANGES.txt?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/CHANGES.txt (original)
+++ lucene/dev/trunk/modules/benchmark/CHANGES.txt Thu Mar 29 23:27:45 2012
@@ -5,6 +5,11 @@ The Benchmark contrib package contains c
For more information on past and future Lucene versions, please see:
http://s.apache.org/luceneversions
+3/29/2012
+ LUCENE-3937: Workaround the XERCES-J bug by avoiding the broken UTF-8 decoding
+ in the v2.9.1 release. Replaced the XERCESJ-1247-patched jar with the v2.9.1
+ release jar. (Uwe Schindler, Robert Muir, Mike McCandless)
+
2/15/2011
LUCENE-3768: fix typos in .alg files, and add test that all .alg files in conf/
can be parsed. (Sami Siren via Robert Muir)
Modified: lucene/dev/trunk/modules/benchmark/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/NOTICE.txt?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/NOTICE.txt (original)
+++ lucene/dev/trunk/modules/benchmark/NOTICE.txt Thu Mar 29 23:27:45 2012
@@ -7,4 +7,4 @@ The Apache Software Foundation (http://w
Includes software from other Apache Software Foundation projects,
including, but not limited to:
- Commons Compress (lib/commons-compress-1.0.jar)
- - Xerces (lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
+ - Xerces (lib/xercesImpl-2.9.1.jar)
Modified: lucene/dev/trunk/modules/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/build.xml?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/build.xml (original)
+++ lucene/dev/trunk/modules/benchmark/build.xml Thu Mar 29 23:27:45 2012
@@ -257,11 +257,6 @@
/>
</target>
- <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven">
- <m2-deploy-with-pom-template pom.xml="lib/lucene-xercesImpl-pom.xml.template"
- jar.file="lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar" />
- </target>
-
<target name="compile-test" depends="contrib-build.compile-test">
<!-- copy .alg files as resources for testing -->
<copy todir="${build.dir}/classes/test/conf">
Modified: lucene/dev/trunk/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/NOTICE.txt?rev=1307165&r1=1307164&r2=1307165&view=diff
==============================================================================
--- lucene/dev/trunk/solr/NOTICE.txt (original)
+++ lucene/dev/trunk/solr/NOTICE.txt Thu Mar 29 23:27:45 2012
@@ -91,7 +91,6 @@ including, but not limited to:
- Commons Compress (lib/commons-compress-1.0.jar)
- Commons Digester (lib/commons-digester-1.7.jar)
- Commons Logging (lib/commons-logging-1.0.4.jar)
- - Xerces (lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
=========================================================================
== Apache Lucene Analyzers Notice ==