You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gs...@apache.org on 2010/08/13 15:42:26 UTC
svn commit: r985195 - in /lucene/dev/branches/branch_3x/solr: CHANGES.txt
src/maven/solr-core-pom.xml.template src/maven/solr-solrj-pom.xml.template
Author: gsingers
Date: Fri Aug 13 13:42:26 2010
New Revision: 985195
URL: http://svn.apache.org/viewvc?rev=985195&view=rev
Log:
SOLR-2042: fix woodstox
Modified:
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=985195&r1=985194&r2=985195&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Fri Aug 13 13:42:26 2010
@@ -442,6 +442,8 @@ Build
* LUCENE-2466: Commons-Codec was upgraded from 1.3 to 1.4. (rmuir)
+* SOLR-2042: Fixed some Maven deps (Drew Farris via gsingers)
+
Documentation
----------------------
Modified: lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template?rev=985195&r1=985194&r2=985195&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/solr/src/maven/solr-core-pom.xml.template Fri Aug 13 13:42:26 2010
@@ -118,9 +118,15 @@
<!-- Stax : we could exclude this because already dependancy of solrj -->
<dependency>
- <groupId>woodstox</groupId>
+ <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template?rev=985195&r1=985194&r2=985195&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/solr/src/maven/solr-solrj-pom.xml.template Fri Aug 13 13:42:26 2010
@@ -72,6 +72,12 @@
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>