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 7dbcd53cd4eed76685d1ad64619b97a9d6664a59..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>
@@ -253,6 +252,12 @@ 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>
@@ -263,6 +268,13 @@ limitations under the License.
                                <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>
@@ -441,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>
@@ -473,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 -->
@@ -563,12 +579,28 @@ limitations under the License.
                                <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>
                                <groupId>org.hsqldb</groupId>
                                <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>
@@ -754,13 +786,18 @@ limitations under the License.
                                <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>
+                               <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>
-
+                               <version>${version.activemq-web}</version> </dependency>
+                       -->
                        <dependency>
                                <groupId>javax.xml.soap</groupId>
                                <artifactId>com.springsource.javax.xml.soap</artifactId>