You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2015/01/06 19:14:24 UTC
svn commit: r1649894 - in /lucene/dev/branches/branch_5x: ./ lucene/ solr/
solr/licenses/ solr/solrj/
Author: ab
Date: Tue Jan 6 18:14:23 2015
New Revision: 1649894
URL: http://svn.apache.org/r1649894
Log:
SOLR-6830 Upgrade Woodstox and StAX API.
Added:
lucene/dev/branches/branch_5x/solr/licenses/stax2-api-3.1.4.jar.sha1
- copied unchanged from r1649857, lucene/dev/trunk/solr/licenses/stax2-api-3.1.4.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/stax2-api-LICENSE-BSD.txt
- copied unchanged from r1649857, lucene/dev/trunk/solr/licenses/stax2-api-LICENSE-BSD.txt
lucene/dev/branches/branch_5x/solr/licenses/stax2-api-NOTICE.txt
- copied unchanged from r1649857, lucene/dev/trunk/solr/licenses/stax2-api-NOTICE.txt
lucene/dev/branches/branch_5x/solr/licenses/woodstox-core-asl-4.4.1.jar.sha1
- copied unchanged from r1649857, lucene/dev/trunk/solr/licenses/woodstox-core-asl-4.4.1.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/woodstox-core-asl-LICENSE-ASL.txt
- copied unchanged from r1649857, lucene/dev/trunk/solr/licenses/woodstox-core-asl-LICENSE-ASL.txt
lucene/dev/branches/branch_5x/solr/licenses/woodstox-core-asl-NOTICE.txt
- copied unchanged from r1649857, lucene/dev/trunk/solr/licenses/woodstox-core-asl-NOTICE.txt
Removed:
lucene/dev/branches/branch_5x/solr/licenses/wstx-asl-3.2.7.jar.sha1
lucene/dev/branches/branch_5x/solr/licenses/wstx-asl-LICENSE-ASL.txt
lucene/dev/branches/branch_5x/solr/licenses/wstx-asl-NOTICE.txt
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/licenses/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/ivy.xml
Modified: lucene/dev/branches/branch_5x/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/ivy-versions.properties?rev=1649894&r1=1649893&r2=1649894&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (original)
+++ lucene/dev/branches/branch_5x/lucene/ivy-versions.properties Tue Jan 6 18:14:23 2015
@@ -174,7 +174,8 @@ org.codehaus.jackson.version = 1.9.13
/org.codehaus.jackson/jackson-jaxrs = ${org.codehaus.jackson.version}
/org.codehaus.jackson/jackson-mapper-asl = ${org.codehaus.jackson.version}
-/org.codehaus.woodstox/wstx-asl = 3.2.7
+/org.codehaus.woodstox/stax2-api = 3.1.4
+/org.codehaus.woodstox/woodstox-core-asl = 4.4.1
/org.easymock/easymock = 3.0
/org.eclipse.jetty.orbit/javax.servlet = 3.0.0.v201112011016
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1649894&r1=1649893&r2=1649894&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Jan 6 18:14:23 2015
@@ -590,6 +590,8 @@ Other Changes
* SOLR-6897: Nuke non-NRT mode from code and configuration. (Hossman, shalin)
+* SOLR-6830: Update Woodstox to 4.4.1 and StAX to 3.1.4. (ab)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/solrj/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/ivy.xml?rev=1649894&r1=1649893&r2=1649894&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/ivy.xml Tue Jan 6 18:14:23 2015
@@ -32,7 +32,8 @@
<dependency org="org.apache.httpcomponents" name="httpmime" rev="${/org.apache.httpcomponents/httpmime}" conf="compile"/>
<dependency org="org.apache.httpcomponents" name="httpcore" rev="${/org.apache.httpcomponents/httpcore}" conf="compile"/>
<dependency org="commons-io" name="commons-io" rev="${/commons-io/commons-io}" conf="compile"/>
- <dependency org="org.codehaus.woodstox" name="wstx-asl" rev="${/org.codehaus.woodstox/wstx-asl}" conf="compile"/>
+ <dependency org="org.codehaus.woodstox" name="woodstox-core-asl" rev="${/org.codehaus.woodstox/woodstox-core-asl}" conf="compile"/>
+ <dependency org="org.codehaus.woodstox" name="stax2-api" rev="${/org.codehaus.woodstox/stax2-api}" conf="compile"/>
<dependency org="org.noggit" name="noggit" rev="${/org.noggit/noggit}" conf="compile"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="compile"/>