Use deploy instaed of bundles

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

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 1d512ae78fe849a2b8e125ee90e5b3c599040a84..88e7c8912d31648f3376c2817f18f4305589bb61 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -20,7 +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.maven-argeo-osgi>0.1.10</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>
@@ -221,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>
@@ -252,12 +246,6 @@ 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>
@@ -268,23 +256,35 @@ 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>
+                               <groupId>org.argeo.slc.server</groupId>
+                               <artifactId>bundles</artifactId>
+                               <version>0.11.3-SNAPSHOT</version>
+                               <type>pom</type>
+                       </dependency>
+                        -->
+                       <dependency>
+                               <groupId>org.argeo.slc.server</groupId>
+                               <artifactId>deploy</artifactId>
                                <version>${project.version}</version>
-                               <type>war</type>
+                               <type>pom</type>
                        </dependency>
 
                        <!-- SLC dubious -->
@@ -529,9 +529,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 -->