diff --git a/dev-tools/maven/solr/core/pom.xml.template b/dev-tools/maven/solr/core/pom.xml.template index c967e54c1bc..fc3821c54ea 100644 --- a/dev-tools/maven/solr/core/pom.xml.template +++ b/dev-tools/maven/solr/core/pom.xml.template @@ -160,6 +160,12 @@ org.codehaus.woodstox wstx-asl runtime + + + stax + stax-api + + javax.servlet diff --git a/dev-tools/maven/solr/webapp/pom.xml.template b/dev-tools/maven/solr/webapp/pom.xml.template index 6044679a9a5..9c91c772428 100644 --- a/dev-tools/maven/solr/webapp/pom.xml.template +++ b/dev-tools/maven/solr/webapp/pom.xml.template @@ -115,6 +115,12 @@ org.codehaus.woodstox wstx-asl + + + stax + stax-api + + org.slf4j diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index bc840ead361..8331b141de5 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -319,6 +319,9 @@ Other Changes * 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) +* SOLR-2756: Maven configuration: Excluded transitive stax:stax-api dependency + from org.codehaus.woodstox:wstx-asl dependency. (David Smiley via Steve Rowe) + Documentation ----------------------