Try to fix issue with bundles 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 20c25782a99a6e3a5e86a2c3f97e5b7cf0ae191b..05b3172308381e61c78cc8fe958bbc77e354e17f 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.8</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>
@@ -222,17 +221,11 @@ limitations under the License.
                                <artifactId>org.argeo.slc.support.simple</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.simple</artifactId>
-                               <version>${project.version}</version>
-                               <classifier>tests</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
+                       <!--
+                               <dependency> <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ant</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
+                               <version>${project.version}</version> </dependency>
+                       -->
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.hibernate</artifactId>
@@ -263,23 +256,27 @@ 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.ws.client</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>
+                               <groupId>org.argeo.slc</groupId>
+                               <artifactId>org.argeo.slc.webapp</artifactId>
                                <version>${project.version}</version>
+                               <type>war</type>
                        </dependency>
                        <dependency>
-                               <groupId>org.argeo.slc.runtime</groupId>
-                               <artifactId>org.argeo.slc.support.ws.client</artifactId>
+                               <groupId>org.argeo.slc.server</groupId>
+                               <artifactId>org.argeo.slc.ria</artifactId>
                                <version>${project.version}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.argeo.slc</groupId>
-                               <artifactId>org.argeo.slc.webapp</artifactId>
-                               <version>${project.version}</version>
-                               <type>war</type>
+                               <groupId>org.argeo.slc.server</groupId>
+                               <artifactId>bundles</artifactId>
+                               <version>0.11.3-SNAPSHOT</version>
+                               <type>pom</type>
                        </dependency>
 
                        <!-- SLC dubious -->
@@ -487,7 +484,7 @@ limitations under the License.
                        <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 -->
@@ -524,9 +521,9 @@ limitations under the License.
 
                        <!-- Ant -->
                        <dependency>
-                               <groupId>org.argeo.dep.osgi</groupId>
-                               <artifactId>org.argeo.dep.osgi.ant</artifactId>
-                               <version>1.7.1</version>
+                               <groupId>org.apache.ant</groupId>
+                               <artifactId>com.springsource.org.apache.tools.ant</artifactId>
+                               <version>1.7.0</version>
                        </dependency>
 
                        <!-- Required by specific Ant tasks -->