Author: veithen
Date: Sun Nov 14 12:01:26 2010
New Revision: 1034988
URL: http://svn.apache.org/viewvc?rev=1034988&view=rev
Log:
Added axiom-dom as a direct dependency since it is no longer a transitive
dependency (via axis2-kernel).
Modified:
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1034988&r1=1034987&r2=1034988&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sun Nov 14 12:01:26 2010
@@ -166,7 +166,7 @@
<dependencies>
- <!-- Axis2 Dependencies -->
+ <!-- Axis2 and Axiom Dependencies -->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-kernel</artifactId>
@@ -191,6 +191,10 @@
<version>${axis2.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ </dependency>
<!-- Other Rampart Dependencies -->
<dependency>
@@ -277,6 +281,27 @@
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Since Rampart depends on DOOM, but axiom-dom is not a
transitive
+ dependency, we need to manage the Axiom version. -->
+ <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>
+ </dependencies>
+ </dependencyManagement>
<profiles>
<profile>
@@ -320,34 +345,6 @@
<module>modules/distribution</module>
</modules>
</profile>
-
- <profile>
- <id>axiom-managed</id>
- <activation>
- <property>
- <name>axiom.version</name>
- </property>
- </activation>
- <dependencyManagement>
- <dependencies>
- <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>
- </dependencies>
- </dependencyManagement>
- </profile>
</profiles>
<modules>
@@ -367,6 +364,7 @@
<rahas.mar.version>SNAPSHOT</rahas.mar.version>
<axis2.version>SNAPSHOT</axis2.version>
+ <axiom.version>1.2.11-SNAPSHOT</axiom.version>
<wss4j.version>1.5.10-SNAPSHOT</wss4j.version>
<xmlsec.version>1.4.2</xmlsec.version>
