[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

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 1f9b38a85d8735596ad4e1a7493db54767d5e81a..9bb9fcba5c85e712c5a7b9254a3a25c1a043d988 100644 (file)
--- 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 d5588a56ad9daccff891c1068f3267426e6f3b73..1ff34b4f655ae44e481288831269f6630b9e7ddd 100644 (file)
--- 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 d369ec1bc80048af293c166d821274d096300a4f..1cfe9537d4b1cda6ac41d90ecd213823058b52d3 100644 (file)
--- 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 46503aac230bf6b8e86d79e064e6157735e2f839..93d243465ff9724a1c31f0493ce06100ce5406bf 100644 (file)
--- 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>