Author: veithen
Date: Sun Jul 11 17:05:59 2010
New Revision: 963112
URL: http://svn.apache.org/viewvc?rev=963112&view=rev
Log:
Let Maven handle Axiom as a transitive dependeny of Axis2. No need to use a
dependency or dependencyManagement here.
Modified:
axis/axis2/java/transports/trunk/modules/base/pom.xml
axis/axis2/java/transports/trunk/pom.xml
Modified: axis/axis2/java/transports/trunk/modules/base/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/pom.xml?rev=963112&r1=963111&r2=963112&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/modules/base/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/base/pom.xml Sun Jul 11 17:05:59
2010
@@ -76,29 +76,6 @@
</build>
<dependencies>
-
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
- </dependency>
<!-- Axis2 -->
<dependency>
<groupId>org.apache.axis2</groupId>
Modified: axis/axis2/java/transports/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=963112&r1=963111&r2=963112&view=diff
==============================================================================
--- axis/axis2/java/transports/trunk/pom.xml (original)
+++ axis/axis2/java/transports/trunk/pom.xml Sun Jul 11 17:05:59 2010
@@ -285,26 +285,6 @@
<version>${axis2.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-api</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-impl</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-dom</artifactId>
- <version>${axiom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>
@@ -495,7 +475,6 @@
</reporting>
<properties>
- <axiom.version>1.2.9-SNAPSHOT</axiom.version>
<axis2.version>SNAPSHOT</axis2.version>
<failIfNoTests>false</failIfNoTests>
</properties>
