Simplify equinox launching

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 1416cfd53f58e72496cd7d07da9bc6e24038347a..6ff4c1acb6ae0541e21ca2ac6cc62a06cca47141 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -16,8 +16,9 @@
                <version.maven>2.0.9</version.maven>
                <version.ant>1.7.0</version.ant>
                <version.jetty>6.1.14</version.jetty>
+               <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
                <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>
@@ -530,6 +531,11 @@ limitations under the License.
                                <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</artifactId>
+                               <version>2.2.0</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.objectweb.asm</groupId>
                                <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
@@ -706,7 +712,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.eclipse.osgi</groupId>
                                <artifactId>org.eclipse.osgi</artifactId>
-                               <version>3.4.2.R34x_v20080826-1230</version>
+                               <version>${version.equinox}</version>
                        </dependency>
 
                        <!-- Auto UI -->
@@ -766,34 +772,30 @@ 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>
-                       <dependency>
-                               <groupId>org.apache.activemq</groupId>
-                               <artifactId>com.springsource.org.apache.activemq.pool</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.2</version>
                        </dependency>
+
                        <dependency>
                                <groupId>org.apache.camel</groupId>
                                <artifactId>com.springsource.org.apache.camel</artifactId>