From 0d0e89a25bbe7c12ce38b9172d41a988f8f88082 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 3 Oct 2011 15:12:20 +0000
Subject: [MRM-1515] see how to reduce dependencies: exclude stax:stax-api

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178425 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-rest/archiva-rest-services/pom.xml         | 4 ++++
 archiva-modules/archiva-web/archiva-webapp/pom.xml                 | 6 ++++++
 archiva-modules/archiva-web/archiva-webdav/pom.xml                 | 6 ++++++
 pom.xml                                                            | 7 +++++++
 4 files changed, 23 insertions(+)

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 1f9b38a85..9bb9fcba5 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -96,6 +96,10 @@
           <groupId>commons-logging</groupId>
           <artifactId>commons-logging</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index d5588a56a..1ff34b4f6 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -385,6 +385,12 @@
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index d369ec1bc..1cfe9537d 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -98,6 +98,12 @@
     <dependency>
       <groupId>org.codehaus.redback</groupId>
       <artifactId>redback-struts2-integration</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.codehaus.redback</groupId>
diff --git a/pom.xml b/pom.xml
index 46503aac2..93d243465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,6 +467,12 @@
         <artifactId>stax</artifactId>
         <version>1.2.0</version>
       </dependency>
+      <dependency>
+        <groupId>javax.xml.stream</groupId>
+        <artifactId>stax-api</artifactId>
+        <version>1.0-2</version>
+      </dependency>
+
       <dependency>
         <groupId>net.sf.beanlib</groupId>
         <artifactId>beanlib</artifactId>
@@ -1386,6 +1392,7 @@
                     <exclude>ant:ant-optional</exclude>
                     <exclude>xom:xom</exclude>
                     <exclude>struts:struts</exclude>
+                    <exclude>stax:stax-api</exclude>
                     <exclude>org.codehaus.plexus:plexus-xwork-integration</exclude>
                     <exclude>org.codehaus.plexus:plexus-component-api</exclude>
                     <exclude>org.codehaus.plexus:plexus-container-default</exclude>
-- 
cgit v1.2.3