ODE-820: Downgraded axis2 deps to 1.3 for maven2 to unify builds
git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.X@945490 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/axis2-war/pom.xml b/axis2-war/pom.xml
index a50ceb7..4f1ec3e 100644
--- a/axis2-war/pom.xml
+++ b/axis2-war/pom.xml
@@ -32,9 +32,7 @@
</parent>
<properties>
- <rampart.version>1.4</rampart.version>
<mex.version>1.41</mex.version>
- <axis2.version>1.4.1</axis2.version>
<jibx.version>1.1.5</jibx.version>
<tranql.version>1.1</tranql.version>
<opensaml.version>1.1</opensaml.version>
@@ -91,12 +89,11 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
- <artifactId>ode-axis2</artifactId>
+ <artifactId>ode-bpel-ql</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-corba</artifactId>
- <version>${axis2.version}</version>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -176,6 +173,11 @@
<version>${geronimo-spec-jms.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_2.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
</dependency>
@@ -183,6 +185,7 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
@@ -207,6 +210,7 @@
<type>mar</type>
<version>${mex.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
diff --git a/axis2-war/src/main/assembly/bin.xml b/axis2-war/src/main/assembly/bin.xml
index 81a7094..69ec278 100644
--- a/axis2-war/src/main/assembly/bin.xml
+++ b/axis2-war/src/main/assembly/bin.xml
@@ -80,13 +80,13 @@
<include>org.apache.ode:ode-agents</include>
<include>org.apache.ode:ode-bpel-obj</include>
<include>org.apache.ode:ode-dao-jpa</include>
+ <include>org.apache.ode:ode-bpel-ql</include>
<include>annogen:annogen</include>
<include>antlr:antlr</include>
<include>javax.activation:activation</include>
<include>org.apache.axis2:axis2-adb</include>
<include>org.apache.axis2:axis2-adb-codegen</include>
<include>org.apache.axis2:axis2-codegen</include>
- <include>org.apache.axis2:axis2-corba</include>
<include>org.apache.axis2:axis2-fastinfoset</include>
<include>org.apache.axis2:axis2-java2wsdl</include>
<include>org.apache.axis2:axis2-jaxbri</include>
diff --git a/axis2/pom.xml b/axis2/pom.xml
index cec4ae9..efaaeba 100644
--- a/axis2/pom.xml
+++ b/axis2/pom.xml
@@ -30,7 +30,6 @@
</parent>
<properties>
- <rampart.version>1.4</rampart.version>
<servlet.version>2.4</servlet.version>
</properties>
diff --git a/pom.xml b/pom.xml
index 8afe910..a2d03af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,11 +41,12 @@
<annogen.version>0.1.0</annogen.version>
<antlr.version>2.7.7</antlr.version>
<axiom.version>1.2.7</axiom.version>
- <axis2.version>1.4.1</axis2.version>
+ <axis2.version>1.3</axis2.version>
+ <rampart.version>1.3</rampart.version>
<commons.codec.version>1.3</commons.codec.version>
<backport.concurrent.version>3.1</backport.concurrent.version>
<commons.fileupload.version>1.2</commons.fileupload.version>
- <commons.collections.version>3.1</commons.collections.version>
+ <commons.collections.version>3.2.1</commons.collections.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
<commons.io.version>1.4</commons.io.version>
<commons.lang.version>2.4</commons.lang.version>
