You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by gs...@apache.org on 2008/09/11 17:32:35 UTC
svn commit: r694305 - in /lucene/solr/branches/branch-1.3: CHANGES.txt
build.xml lib/geronimo-stax-api_1.0_spec-1.0.1.jar lib/stax-1.2.0.jar
lib/stax-api-1.0.1.jar lib/wstx-asl-3.2.7.jar
src/maven/solr-core-pom.xml.template
Author: gsingers
Date: Thu Sep 11 08:32:25 2008
New Revision: 694305
URL: http://svn.apache.org/viewvc?rev=694305&view=rev
Log:
SOLR-770: Change StAX implementation
Added:
lucene/solr/branches/branch-1.3/lib/geronimo-stax-api_1.0_spec-1.0.1.jar (with props)
lucene/solr/branches/branch-1.3/lib/wstx-asl-3.2.7.jar (with props)
Removed:
lucene/solr/branches/branch-1.3/lib/stax-1.2.0.jar
lucene/solr/branches/branch-1.3/lib/stax-api-1.0.1.jar
Modified:
lucene/solr/branches/branch-1.3/CHANGES.txt
lucene/solr/branches/branch-1.3/build.xml
lucene/solr/branches/branch-1.3/src/maven/solr-core-pom.xml.template
Modified: lucene/solr/branches/branch-1.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/CHANGES.txt?rev=694305&r1=694304&r2=694305&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.3/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.3/CHANGES.txt Thu Sep 11 08:32:25 2008
@@ -632,6 +632,8 @@
24. Upgraded to Lucene 2.4-dev (r686801) (yonik)
25. Upgraded to Lucene 2.4-dev (r688745) 27-Aug-2008 (yonik)
26. Upgraded to Lucene 2.4-dev (r691741) 03-Sep-2008 (yonik)
+27. Replaced the StAX reference implementation with the geronimo
+ StAX API jar, and the Woodstox StAX implementation. (yonik)
Build
1. SOLR-411. Changed the names of the Solr JARs to use the defacto standard JAR names based on
Modified: lucene/solr/branches/branch-1.3/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/build.xml?rev=694305&r1=694304&r2=694305&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.3/build.xml (original)
+++ lucene/solr/branches/branch-1.3/build.xml Thu Sep 11 08:32:25 2008
@@ -305,7 +305,8 @@
</fileset>
<fileset dir="${lib}">
<include name="commons-io-*.jar" />
- <include name="stax-*.jar" />
+ <include name="*stax-*.jar" />
+ <include name="wstx-*.jar" />
</fileset>
<pathelement location="${dest}/common"/>
</path>
@@ -597,7 +598,8 @@
<fileset dir="${lib}">
<include name="commons-codec-*.jar"/>
<include name="commons-io-*.jar"/>
- <include name="stax-*.jar"/>
+ <include name="*stax-*.jar" />
+ <include name="wstx-*.jar" />
</fileset>
<fileset dir="${solrj-dir}/lib">
<include name="*.jar" />
Added: lucene/solr/branches/branch-1.3/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/lib/geronimo-stax-api_1.0_spec-1.0.1.jar?rev=694305&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/branch-1.3/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: lucene/solr/branches/branch-1.3/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/branch-1.3/lib/wstx-asl-3.2.7.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/lib/wstx-asl-3.2.7.jar?rev=694305&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/branch-1.3/lib/wstx-asl-3.2.7.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: lucene/solr/branches/branch-1.3/lib/wstx-asl-3.2.7.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/solr/branches/branch-1.3/src/maven/solr-core-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.3/src/maven/solr-core-pom.xml.template?rev=694305&r1=694304&r2=694305&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.3/src/maven/solr-core-pom.xml.template (original)
+++ lucene/solr/branches/branch-1.3/src/maven/solr-core-pom.xml.template Thu Sep 11 08:32:25 2008
@@ -108,13 +108,13 @@
<!-- Stax -->
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax</artifactId>
- <version>1.2.0</version>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.2.7</version>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>