From 527bcf67b122ed4b6aad21928d2d6abcb5f2cf6c Mon Sep 17 00:00:00 2001
From: Steven Rowe <sarowe@apache.org>
Date: Wed, 14 Sep 2011 23:12:36 +0000
Subject: [PATCH] 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
---
 dev-tools/maven/solr/core/pom.xml.template   | 6 ++++++
 dev-tools/maven/solr/webapp/pom.xml.template | 6 ++++++
 solr/CHANGES.txt                             | 3 +++
 3 files changed, 15 insertions(+)

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 @@
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-asl</artifactId>
       <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
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 @@
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-asl</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
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
 ----------------------