Upgrade OSGi plugin

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 67cbe8968b58f170adf919b5bd0529c1526d34e1..ee6ec128c9a53598095cfc8fe0d59e0fdcdc1578 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -20,8 +20,7 @@
                <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.0006</version.activemq>
-               <version.activemq-web>5.2.0.0005</version.activemq-web>
-               <version.maven-argeo-osgi>0.1.7</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.11</version.maven-argeo-osgi>
        </properties>
        <scm>
                <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -159,27 +158,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>
@@ -274,11 +252,29 @@ 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.server</artifactId>
+                               <version>${project.version}</version>
+                               <classifier>tests</classifier>
+                       </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>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.equinox</artifactId>
+                               <classifier>tests</classifier>
+                               <scope>test</scope>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ws.client</artifactId>
@@ -457,12 +453,11 @@ limitations under the License.
                                <artifactId>org.springframework.jms</artifactId>
                                <version>${version.spring}</version>
                        </dependency>
-
-                       <dependency>
-                               <groupId>org.springframework.ws</groupId>
+                       <!--
+                               <dependency> <groupId>org.springframework.ws</groupId>
                                <artifactId>org.springframework.ws</artifactId>
-                               <version>${version.spring-ws}</version>
-                       </dependency>
+                               <version>${version.spring-ws}</version> </dependency>
+                       -->
                        <dependency>
                                <groupId>org.springframework.ws</groupId>
                                <artifactId>org.springframework.oxm</artifactId>
@@ -489,10 +484,15 @@ limitations under the License.
                                <artifactId>org.springframework.osgi.web</artifactId>
                                <version>${version.spring-osgi}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.springframework.osgi</groupId>
+                               <artifactId>org.springframework.osgi.test</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.argeo.2</version>
+                               <version>1.0.0.argeo3</version>
                        </dependency>
 
                        <!-- AOP -->
@@ -574,6 +574,16 @@ 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>
+                       <dependency>
+                               <groupId>org.apache.commons</groupId>
+                               <artifactId>com.springsource.org.apache.commons.dbcp</artifactId>
+                               <version>1.2.2.osgi</version>
+                       </dependency>
 
                        <!-- DB Drivers -->
                        <dependency>
@@ -581,6 +591,16 @@ limitations under the License.
                                <artifactId>com.springsource.org.hsqldb</artifactId>
                                <version>1.8.0.9</version>
                        </dependency>
+                       <dependency>
+                               <groupId>net.sourceforge.jtds</groupId>
+                               <artifactId>com.springsource.net.sourceforge.jtds</artifactId>
+                               <version>1.2.2</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>com.mysql.jdbc</groupId>
+                               <artifactId>com.springsource.com.mysql.jdbc</artifactId>
+                               <version>5.1.6</version>
+                       </dependency>
 
                        <!-- XML -->
                        <dependency>
@@ -763,11 +783,21 @@ limitations under the License.
                                <version>${version.activemq}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.argeo.dep.osgi</groupId>
-                               <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
-                               <version>${version.activemq-web}</version>
+                               <groupId>org.apache.activemq</groupId>
+                               <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
+                               <version>5.2.0</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.activemq</groupId>
+                                               <artifactId>com.springsource.org.apache.activemq</artifactId>
+                                       </exclusion>
+                               </exclusions>
                        </dependency>
-
+                       <!--
+                               <dependency> <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+                               <version>${version.activemq-web}</version> </dependency>
+                       -->
                        <dependency>
                                <groupId>javax.xml.soap</groupId>
                                <artifactId>com.springsource.javax.xml.soap</artifactId>