From 48b89eb8c8529584609baeb9bf9382eef26781eb Mon Sep 17 00:00:00 2001
From: Grant Ingersoll <gsingers@apache.org>
Date: Fri, 13 Aug 2010 13:44:11 +0000
Subject: [PATCH] SOLR-2042: fix woodstox

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@985197 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt                           | 2 ++
 solr/src/maven/solr-core-pom.xml.template  | 8 +++++++-
 solr/src/maven/solr-solrj-pom.xml.template | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0656a02c131..55073e1dbd1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -509,6 +509,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
 ----------------------
 
diff --git a/solr/src/maven/solr-core-pom.xml.template b/solr/src/maven/solr-core-pom.xml.template
index 46e1e022560..b896365ea74 100644
--- a/solr/src/maven/solr-core-pom.xml.template
+++ b/solr/src/maven/solr-core-pom.xml.template
@@ -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>
diff --git a/solr/src/maven/solr-solrj-pom.xml.template b/solr/src/maven/solr-solrj-pom.xml.template
index 314bb829ede..5359d377291 100644
--- a/solr/src/maven/solr-solrj-pom.xml.template
+++ b/solr/src/maven/solr-solrj-pom.xml.template
@@ -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>