Jan,

Per the commit of r366236...

-1 on including Axiom.  That is just for the web app.  We should not be
including that in the container.  Also, you can use the standard
ActiveMQ..there is no need to use the WADI version.  The WADI version
was due to M2 POMs being incorrect and it broke the WADI builds.  They
are identical to 3.2.1.

Jeff


Index: project.xml
===================================================================
--- project.xml (revision 366235)
+++ project.xml (working copy)
@@ -190,6 +190,9 @@
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
             <version>${concurrent_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
         </dependency>

         <dependency>
@@ -197,6 +200,9 @@
             <artifactId>regexp</artifactId>
             <version>${regexp_version}</version>
             <url>http://jakarta.apache.org/regexp</url>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
         </dependency>

         <dependency>
@@ -241,6 +247,22 @@
              </properties>
         </dependency>
         <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commons_collections_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>commons-primitives</groupId>
+            <artifactId>commons-primitives</artifactId>
+            <version>${commons_primitives_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
             <groupId>springframework</groupId>
             <artifactId>spring</artifactId>
             <version>${wadi_spring_version}</version>
@@ -250,6 +272,14 @@
              </properties>
         </dependency>
         <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>${backport_util_concurrent_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
             <groupId>activecluster</groupId>
             <artifactId>activecluster</artifactId>
             <version>${wadi_activecluster_version}</version>
@@ -258,6 +288,23 @@
              </properties>
         </dependency>
         <dependency>
+            <groupId>activemq</groupId>
+            <artifactId>activemq</artifactId>
+            <version>${wadi_activemq_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+        <dependency>
+            <groupId>axion</groupId>
+            <artifactId>axion</artifactId>
+            <version>${wadi_axion_version}</version>
+            <properties>
+                 <geronimo.dependency>true</geronimo.dependency>
+             </properties>
+        </dependency>
+
+        <dependency>
             <groupId>wadi</groupId>
             <artifactId>wadi-core</artifactId>
             <version>${wadi_version}</version>

Reply via email to