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 2011/03/10 16:57:52 UTC
svn commit: r1080258 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/maven/ dev-tools/maven/modules/benchmark/ modules/benchmark/
modules/benchmark/lib/ solr/
Author: sarowe
Date: Thu Mar 10 15:57:52 2011
New Revision: 1080258
URL: http://svn.apache.org/viewvc?rev=1080258&view=rev
Log:
LUCENE-2961: Remove benchmark/lib/xml-apis-2.9.0.jar - JVM 1.5+ contains these JAXP 1.3 interface classes
Removed:
lucene/dev/trunk/modules/benchmark/lib/xml-apis-2.9.0.jar
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/modules/benchmark/CHANGES.txt
lucene/dev/trunk/modules/benchmark/NOTICE.txt
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=1080258&r1=1080257&r2=1080258&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Thu Mar 10 15:57:52 2011
@@ -94,7 +94,6 @@
<classpathentry kind="lib" path="modules/benchmark/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
- <classpathentry kind="lib" path="modules/benchmark/lib/xml-apis-2.9.0.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r944541.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-codec-1.4.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=1080258&r1=1080257&r2=1080258&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 10 15:57:52 2011
@@ -88,10 +88,6 @@
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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=1080258&r1=1080257&r2=1080258&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Thu Mar 10 15:57:52 2011
@@ -369,11 +369,6 @@
<version>2.9.1-patched-XERCESJ-1257</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.0</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
@@ -648,20 +643,6 @@
</configuration>
</execution>
<execution>
- <id>install-xml-apis</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>2.9.0</version>
- <packaging>jar</packaging>
- <file>modules/benchmark/lib/xml-apis-2.9.0.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-berkeleydb</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/trunk/modules/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/CHANGES.txt?rev=1080258&r1=1080257&r2=1080258&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/CHANGES.txt (original)
+++ lucene/dev/trunk/modules/benchmark/CHANGES.txt Thu Mar 10 15:57:52 2011
@@ -2,12 +2,21 @@ Lucene Benchmark Contrib Change Log
The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
+03/10/2011
+ LUCENE-2961: Removed lib/xml-apis.jar, since JVM 1.5+ already contains the
+ JAXP 1.3 interface classes it provides.
+
02/05/2011
LUCENE-1540: Improvements to contrib.benchmark for TREC collections.
ContentSource can now process plain text files, gzip files, and bzip2 files.
TREC doc parsing now handles the TREC gov2 collection and TREC disks 4&5-CR
collection (both used by many TREC tasks). (Shai Erera, Doron Cohen)
-
+
+01/31/2011
+ LUCENE-1591: Rollback to xerces-2.9.1-patched-XERCESJ-1257.jar to workaround
+ XERCESJ-1257, which we hit on current Wikipedia XML export
+ (ENWIKI-20110115-pages-articles.xml) with xerces-2.10.0.jar. (Mike McCandless)
+
01/26/2011
LUCENE-929: ExtractReuters first extracts to a tmp dir and then renames. That
way, if a previous extract attempt failed, "ant extract-reuters" will still
@@ -33,7 +42,7 @@ The Benchmark contrib package contains c
4/27/2010: WriteLineDocTask now supports multi-threading. Also,
StringBufferReader was renamed to StringBuilderReader and works on
- StringBuilder now. In addition, LongToEnglishCountentSource starts from 0
+ StringBuilder now. In addition, LongToEnglishContentSource starts from 0
(instead of Long.MIN_VAL+10) and wraps around to MIN_VAL (if you ever hit
Long.MAX_VAL). (Shai Erera)
Modified: lucene/dev/trunk/modules/benchmark/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/NOTICE.txt?rev=1080258&r1=1080257&r2=1080258&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/NOTICE.txt (original)
+++ lucene/dev/trunk/modules/benchmark/NOTICE.txt Thu Mar 10 15:57:52 2011
@@ -11,4 +11,4 @@ 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, lib/xml-apis-2.9.0.jar)
+ - Xerces (lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
Modified: lucene/dev/trunk/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/NOTICE.txt?rev=1080258&r1=1080257&r2=1080258&view=diff
==============================================================================
--- lucene/dev/trunk/solr/NOTICE.txt (original)
+++ lucene/dev/trunk/solr/NOTICE.txt Thu Mar 10 15:57:52 2011
@@ -87,7 +87,7 @@ 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, lib/xml-apis-2.9.0.jar)
+ - Xerces (lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar)
=========================================================================
== Apache Lucene Analyzers Notice ==