Author: veithen
Date: Tue Dec 28 13:38:51 2010
New Revision: 1053347
URL: http://svn.apache.org/viewvc?rev=1053347&view=rev
Log:
Use dependencyManagement for all Axis2 and Axiom dependencies. This gives us
better control over the stuff downloaded by Maven when resolving transitive
dependencies.
Modified:
axis/axis2/java/sandesha/trunk/modules/core/pom.xml
axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml
axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
axis/axis2/java/sandesha/trunk/modules/tests/pom.xml
axis/axis2/java/sandesha/trunk/pom.xml
Modified: axis/axis2/java/sandesha/trunk/modules/core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/pom.xml?rev=1053347&r1=1053346&r2=1053347&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/core/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/core/pom.xml Tue Dec 28 13:38:51 2010
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/sandesha/trunk/modules/interop/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/pom.xml?rev=1053347&r1=1053346&r2=1053347&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/interop/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/interop/pom.xml Tue Dec 28 13:38:51
2010
@@ -132,19 +132,16 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-adb-codegen</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
Modified: axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml?rev=1053347&r1=1053346&r2=1053347&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/persistence/pom.xml Tue Dec 28
13:38:51 2010
@@ -121,12 +121,10 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/modules/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/samples/pom.xml?rev=1053347&r1=1053346&r2=1053347&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/samples/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/samples/pom.xml Tue Dec 28 13:38:51
2010
@@ -112,7 +112,6 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
</dependency>
</dependencies>
Modified: axis/axis2/java/sandesha/trunk/modules/tests/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/tests/pom.xml?rev=1053347&r1=1053346&r2=1053347&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/modules/tests/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/modules/tests/pom.xml Tue Dec 28 13:38:51
2010
@@ -168,12 +168,10 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.sandesha2</groupId>
Modified: axis/axis2/java/sandesha/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1053347&r1=1053346&r2=1053347&view=diff
==============================================================================
--- axis/axis2/java/sandesha/trunk/pom.xml (original)
+++ axis/axis2/java/sandesha/trunk/pom.xml Tue Dec 28 13:38:51 2010
@@ -264,17 +264,14 @@
<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>
@@ -307,20 +304,17 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>addressing</artifactId>
- <version>${axis2.version}</version>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-mtompolicy</artifactId>
- <version>${axis2.version}</version>
</dependency>
</dependencies>
@@ -348,14 +342,70 @@
<artifactId>rampart-policy</artifactId>
<version>${rampart.version}</version>
</dependency>
- <!-- This ensures that we always use artifacts from the expected
Axis2 version,
+ <!-- This ensures that we always use artifacts from the expected
Axiom and Axis2 versions,
even for transitive dependencies of Rampart -->
<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.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb-codegen</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <version>${axis2.version}</version>
+ <type>mar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mtompolicy</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
<classifier>impl</classifier>
<version>${axis2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-local</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
