X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=88e7c8912d31648f3376c2817f18f4305589bb61;hb=ac955220781e2d2ab38dc45626a5b4fd3bdb05c7;hp=fc33ff5eaa7ac0510c1189f615e21f531fdab3b3;hpb=e1384618cb6d1c06ec570d7798b783fa04a3d807;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index fc33ff5ea..88e7c8912 100644
--- 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,17 +256,36 @@ limitations under the License.
 				<artifactId>org.argeo.slc.support.equinox</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.argeo.slc.runtime</groupId>
+			<!--
+				<dependency> <groupId>org.argeo.slc.runtime</groupId>
 				<artifactId>org.argeo.slc.support.ws.client</artifactId>
-				<version>${project.version}</version>
-			</dependency>
+				<version>${project.version}</version> </dependency>
+			-->
 			<dependency>
 				<groupId>org.argeo.slc</groupId>
 				<artifactId>org.argeo.slc.webapp</artifactId>
 				<version>${project.version}</version>
 				<type>war</type>
 			</dependency>
+			<dependency>
+				<groupId>org.argeo.slc.server</groupId>
+				<artifactId>org.argeo.slc.ria</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<!-- 
+			<dependency>
+				<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>pom</type>
+			</dependency>
 
 			<!-- SLC dubious -->
 			<dependency>
@@ -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 -->
@@ -513,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 -->
@@ -770,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>