X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=a19a72f89b37b8f29d8f7bfb2f8432a17438542f;hb=18286b44ee18356985d0b435bd1aa3f34bc6425c;hp=7b119815668d9bb3b01dc63d348bf198f24cf016;hpb=5ca0831fd91542776d1d4a8b51e07b9982bd634e;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 7b1198156..a19a72f89 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -16,9 +16,10 @@
 		<version.maven>2.0.9</version.maven>
 		<version.ant>1.7.0</version.ant>
 		<version.jetty>6.1.14</version.jetty>
+		<version.tomcat>6.0.18</version.tomcat>
 		<version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
-		<version.maven-bundle-plugin>1.4.3</version.maven-bundle-plugin>
-		<!-- <version.activemq>5.2.0</version.activemq> -->
+		<version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
+		<version.activemq>5.2.0.0005</version.activemq>
 	</properties>
 	<scm>
 		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -171,7 +172,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>
@@ -358,7 +358,6 @@ limitations under the License.
 				<artifactId>
 					com.springsource.com.sun.xml.messaging.saaj
 				</artifactId>
-				<scope>runtime</scope>
 				<version>1.3.0</version>
 			</dependency>
 			<dependency>
@@ -539,6 +538,11 @@ limitations under the License.
 				<artifactId>com.springsource.org.aspectj.weaver</artifactId>
 				<version>1.6.2.RELEASE</version>
 			</dependency>
+			<dependency>
+				<groupId>org.aopalliance</groupId>
+				<artifactId>com.springsource.org.aopalliance</artifactId>
+				<version>1.0.0</version>
+			</dependency>
 			<dependency>
 				<groupId>net.sourceforge.cglib</groupId>
 				<artifactId>com.springsource.net.sf.cglib</artifactId>
@@ -683,7 +687,17 @@ limitations under the License.
 			<dependency>
 				<groupId>org.apache.catalina</groupId>
 				<artifactId>com.springsource.org.apache.catalina</artifactId>
-				<version>6.0.18</version>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.jasper</groupId>
+				<artifactId>com.springsource.org.apache.jasper</artifactId>
+				<version>${version.tomcat}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.el</groupId>
+				<artifactId>com.springsource.org.apache.el</artifactId>
+				<version>${version.tomcat}</version>
 			</dependency>
 
 			<!-- Maven -->
@@ -712,16 +726,6 @@ limitations under the License.
 			</dependency>
 
 			<!-- OSGi -->
-			<!--
-				<dependency> <groupId>org.apache.felix</groupId>
-				<artifactId>org.apache.felix.main</artifactId>
-				<version>1.2.1</version> <exclusions> <exclusion>
-				<groupId>org.apache.felix</groupId> <artifactId>
-				org.apache.felix.framework </artifactId> </exclusion> </exclusions>
-				</dependency> <dependency> <groupId>org.apache.felix</groupId>
-				<artifactId>org.osgi.core</artifactId> <version>1.2.0</version>
-				<scope>provided</scope> </dependency>
-			-->
 			<dependency>
 				<groupId>org.eclipse.osgi</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
@@ -785,28 +789,31 @@ limitations under the License.
 			</dependency>
 
 			<!-- ActiveMQ -->
-			<!--
-				<dependency> <groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq</artifactId>
-				<version>${version.activemq}</version> </dependency>
-			-->
-			<!--
-				<dependency> <groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq.web</artifactId>
-				<version>${version.activemq}</version> </dependency> <dependency>
-				<groupId>org.apache.activemq</groupId>
-				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
-				<version>${version.activemq}</version> </dependency>
-			-->
-			<!--
-				<dependency> <groupId>org.apache.xbean</groupId>
-				<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-				<version>3.3.0</version> </dependency>
-			-->
 			<dependency>
 				<groupId>org.argeo.dep.osgi</groupId>
 				<artifactId>org.argeo.dep.osgi.activemq</artifactId>
-				<version>5.2.0.argeo.3</version>
+				<version>${version.activemq}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.argeo.dep.osgi</groupId>
+				<artifactId>org.argeo.dep.osgi.activemq.web</artifactId>
+				<version>${version.activemq}</version>
+			</dependency>
+
+			<dependency>
+				<groupId>javax.xml.soap</groupId>
+				<artifactId>com.springsource.javax.xml.soap</artifactId>
+				<version>1.3.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.rpc</groupId>
+				<artifactId>com.springsource.javax.xml.rpc</artifactId>
+				<version>1.1.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.ejb</groupId>
+				<artifactId>com.springsource.javax.ejb</artifactId>
+				<version>3.0.0</version>
 			</dependency>
 
 			<dependency>