Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2756: Maven configuration: Excluded transitive stax:stax-api dependency from org.codehaus.woodstox:wstx-asl dependency. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1170896 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2011-09-14 23:12:36 +00:00
parent eb2ff46bad
commit 527bcf67b1
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev-tools/maven/solr/core/pom.xml.template
View File

@ -160,6 +160,12 @@
<groupId>org.codehaus.woodstox</groupId> <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId> <artifactId>wstx-asl</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>

6
dev-tools/maven/solr/webapp/pom.xml.template
View File

@ -115,6 +115,12 @@
<dependency> <dependency>
<groupId>org.codehaus.woodstox</groupId> <groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId> <artifactId>wstx-asl</artifactId>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

3
solr/CHANGES.txt
View File

@ -319,6 +319,9 @@ Other Changes
* SOLR-1897: The data dir from the core descriptor should override the data dir from * SOLR-1897: The data dir from the core descriptor should override the data dir from
the solrconfig.xml rather than the other way round. (Mark Miller) the solrconfig.xml rather than the other way round. (Mark Miller)
* SOLR-2756: Maven configuration: Excluded transitive stax:stax-api dependency
from org.codehaus.woodstox:wstx-asl dependency. (David Smiley via Steve Rowe)
Documentation Documentation
---------------------- ----------------------