Update activemq version

[gpl/argeo-slc.git] / org.argeo.slc / pom.xml

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 33b4d3afd63d86f747a01ccf90e45e9f2f0ef184..fcf9d8b20722971091dabfba73ec220641c02044 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -17,7 +17,7 @@
                <version.ant>1.7.0</version.ant>
                <version.jetty>6.1.14</version.jetty>
                <version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-               <version.activemq>5.2.0</version.activemq>
+               <!-- <version.activemq>5.2.0</version.activemq> -->
        </properties>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -294,7 +294,7 @@ limitations under the License.
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.execution</artifactId>
+                               <artifactId>org.argeo.slc.support.equinox</artifactId>
                                <version>${project.version}</version>
                        </dependency>
                        <dependency>
@@ -354,6 +354,26 @@ limitations under the License.
                                </artifactId>
                                <version>1.1.1</version>
                        </dependency>
+                       <dependency>
+                               <groupId>javax.annotation</groupId>
+                               <artifactId>com.springsource.javax.annotation</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.persistence</groupId>
+                               <artifactId>com.springsource.javax.persistence</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.ws</groupId>
+                               <artifactId>com.springsource.javax.xml.ws</artifactId>
+                               <version>2.1.1</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>javax.xml.bind</groupId>
+                               <artifactId>com.springsource.javax.xml.bind</artifactId>
+                               <version>2.1.7</version>
+                       </dependency>
 
                        <!-- Unit tests -->
                        <dependency>
@@ -397,6 +417,7 @@ limitations under the License.
                                <artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
                                <version>1.5.3</version>
                        </dependency>
+
                        <!-- Spring -->
                        <dependency>
                                <groupId>org.springframework</groupId>
@@ -477,6 +498,43 @@ limitations under the License.
                                <artifactId>org.springframework.osgi.core</artifactId>
                                <version>${version.spring-osgi}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.web.extender</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.web</artifactId>
+                               <version>${version.spring-osgi}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
+                               <version>1.0.0</version>
+                       </dependency>
+
+                       <!-- AOP -->
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>com.springsource.org.aspectj.runtime</artifactId>
+                               <version>1.6.2.RELEASE</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.aspectj</groupId>
+                               <artifactId>com.springsource.org.aspectj.weaver</artifactId>
+                               <version>1.6.2.RELEASE</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>net.sourceforge.cglib</groupId>
+                               <artifactId>com.springsource.net.sf.cglib</artifactId>
+                               <version>2.1.3</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.objectweb.asm</groupId>
+                               <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+                               <version>2.2.0</version>
+                       </dependency>
 
                        <!-- Ant -->
                        <dependency>
@@ -594,14 +652,6 @@ limitations under the License.
                                <artifactId>com.springsource.javax.activation</artifactId>
                                <version>1.1.1</version>
                        </dependency>
-
-                       <dependency>
-                               <groupId>org.aspectj</groupId>
-                               <artifactId>
-                                       com.springsource.org.aspectj.weaver
-                               </artifactId>
-                               <version>1.6.2.RELEASE</version>
-                       </dependency>
                        <dependency>
                                <groupId>com.lowagie.text</groupId>
                                <artifactId>
@@ -610,6 +660,12 @@ limitations under the License.
                                <version>2.0.8</version>
                        </dependency>
 
+                       <!-- Tomcat -->
+                       <dependency>
+                               <groupId>org.apache.catalina</groupId>
+                               <artifactId>com.springsource.org.apache.catalina</artifactId>
+                               <version>6.0.18</version>
+                       </dependency>
 
                        <!-- Maven -->
                        <dependency>
@@ -710,28 +766,34 @@ limitations under the License.
                        </dependency>
 
                        <!-- ActiveMQ -->
-                       <dependency>
-                               <groupId>org.apache.activemq</groupId>
+                       <!--
+                               <dependency> <groupId>org.apache.activemq</groupId>
                                <artifactId>com.springsource.org.apache.activemq</artifactId>
-                               <version>${version.activemq}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq.web</artifactId>
-                               <version>${version.activemq}</version>
-                       </dependency>
+                               <version>${version.activemq}</version> </dependency>
+                       -->
                        <!--
                                <dependency> <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-pool</artifactId>
+                               <artifactId>com.springsource.org.apache.activemq.web</artifactId>
                                <version>${version.activemq}</version> </dependency> <dependency>
                                <groupId>org.apache.activemq</groupId>
-                               <artifactId>activemq-optional</artifactId>
+                               <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
                                <version>${version.activemq}</version> </dependency>
                        -->
-                       <dependency>
-                               <groupId>org.apache.xbean</groupId>
+                       <!--
+                               <dependency> <groupId>org.apache.xbean</groupId>
                                <artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-                               <version>3.3.0</version>
+                               <version>3.3.0</version> </dependency>
+                       -->
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq</artifactId>
+                               <version>5.2.0.argeo.1</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.apache.camel</groupId>
+                               <artifactId>com.springsource.org.apache.camel</artifactId>
+                               <version>1.3.0</version>
                        </dependency>
 
                </dependencies>