Change bundle structure

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index fde306ff34a57751307569a44b80b196e07727a2..7dbcd53cd4eed76685d1ad64619b97a9d6664a59 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -19,7 +19,8 @@
                <version.tomcat>6.0.18</version.tomcat>
                <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-               <version.activemq>5.2.0.0005</version.activemq>
+               <version.activemq>5.2.0.0006</version.activemq>
+               <version.activemq-web>5.2.0.0005</version.activemq-web>
                <version.maven-argeo-osgi>0.1.7</version.maven-argeo-osgi>
        </properties>
        <scm>
@@ -158,27 +159,6 @@ limitations under the License.
                                                        <artifactId>com.springsource.javax.mail</artifactId>
                                                        <version>1.4.1</version>
                                                </dependency>
-                                               <!--
-                                                       Required by ActiveMQ admin <dependency>
-                                                       <groupId>org.springframework</groupId>
-                                                       <artifactId>org.springframework.web</artifactId>
-                                                       <version>${version.spring}</version> </dependency> <dependency>
-                                                       <groupId>org.springframework</groupId>
-                                                       <artifactId>org.springframework.web.servlet</artifactId>
-                                                       <version>${version.spring}</version> </dependency> <dependency>
-                                                       <groupId>org.apache.activemq</groupId>
-                                                       <artifactId>com.springsource.org.apache.activemq.web</artifactId>
-                                                       <version>${version.activemq}</version> </dependency> <dependency>
-                                                       <groupId>javax.jms</groupId>
-                                                       <artifactId>com.springsource.javax.jms</artifactId>
-                                                       <version>1.1.0</version> </dependency> <dependency>
-                                                       <groupId>org.apache.geronimo.specs</groupId>
-                                                       <artifactId>com.springsource.javax.management.j2ee</artifactId>
-                                                       <version>1.0.1</version> </dependency> <dependency>
-                                                       <groupId>com.opensymphony.sitemesh</groupId>
-                                                       <artifactId>com.springsource.com.opensymphony.sitemesh</artifactId>
-                                                       <version>2.3.0</version> </dependency>
-                                               -->
                                        </dependencies>
                                </plugin>
                                <plugin>
@@ -273,6 +253,11 @@ limitations under the License.
                                <artifactId>org.argeo.slc.server</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.osgiboot</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.equinox</artifactId>
@@ -573,7 +558,11 @@ limitations under the License.
                                <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
                                <version>1.1</version>
                        </dependency>
-
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.pool</artifactId>
+                               <version>1.4.0</version>
+                       </dependency>
                        <!-- DB Drivers -->
                        <dependency>
                                <groupId>org.hsqldb</groupId>
@@ -761,10 +750,15 @@ limitations under the License.
                                <artifactId>org.argeo.dep.osgi.activemq</artifactId>
                                <version>${version.activemq}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.apache.activemq</groupId>
+                               <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+                               <version>5.2.0</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-                               <version>${version.activemq}</version>
+                               <version>${version.activemq-web}</version>
                        </dependency>
 
                        <dependency>