X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc%2Fpom.xml;h=6ff4c1acb6ae0541e21ca2ac6cc62a06cca47141;hb=87e6a0e6c450fe77175ba6f28cf705f2176e910c;hp=095d848bdfe55fb1af998e0b3bb3595c0f13613d;hpb=47ac61a1d8b3d6db956ac5007a05238b2f506b2e;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index 095d848bd..6ff4c1acb 100644
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -16,8 +16,9 @@
 		<version.maven>2.0.9</version.maven>
 		<version.ant>1.7.0</version.ant>
 		<version.jetty>6.1.14</version.jetty>
+		<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.activemq>5.2.0</version.activemq> -->
 	</properties>
 	<scm>
 		<connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc</connection>
@@ -354,6 +355,26 @@ limitations under the License.
 				</artifactId>
 				<version>1.1.1</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.annotation</groupId>
+				<artifactId>com.springsource.javax.annotation</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.persistence</groupId>
+				<artifactId>com.springsource.javax.persistence</artifactId>
+				<version>1.0.0</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.ws</groupId>
+				<artifactId>com.springsource.javax.xml.ws</artifactId>
+				<version>2.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>com.springsource.javax.xml.bind</artifactId>
+				<version>2.1.7</version>
+			</dependency>
 
 			<!-- Unit tests -->
 			<dependency>
@@ -478,6 +499,21 @@ limitations under the License.
 				<artifactId>org.springframework.osgi.core</artifactId>
 				<version>${version.spring-osgi}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.web.extender</artifactId>
+				<version>${version.spring-osgi}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.osgi</groupId>
+				<artifactId>org.springframework.osgi.web</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</version>
+			</dependency>
 
 			<!-- AOP -->
 			<dependency>
@@ -495,6 +531,11 @@ limitations under the License.
 				<artifactId>com.springsource.net.sf.cglib</artifactId>
 				<version>2.1.3</version>
 			</dependency>
+			<dependency>
+				<groupId>org.objectweb.asm</groupId>
+				<artifactId>com.springsource.org.objectweb.asm</artifactId>
+				<version>2.2.0</version>
+			</dependency>
 			<dependency>
 				<groupId>org.objectweb.asm</groupId>
 				<artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
@@ -617,14 +658,6 @@ limitations under the License.
 				<artifactId>com.springsource.javax.activation</artifactId>
 				<version>1.1.1</version>
 			</dependency>
-
-			<dependency>
-				<groupId>org.aspectj</groupId>
-				<artifactId>
-					com.springsource.org.aspectj.weaver
-				</artifactId>
-				<version>1.6.2.RELEASE</version>
-			</dependency>
 			<dependency>
 				<groupId>com.lowagie.text</groupId>
 				<artifactId>
@@ -633,6 +666,12 @@ limitations under the License.
 				<version>2.0.8</version>
 			</dependency>
 
+			<!-- Tomcat -->
+			<dependency>
+				<groupId>org.apache.catalina</groupId>
+				<artifactId>com.springsource.org.apache.catalina</artifactId>
+				<version>6.0.18</version>
+			</dependency>
 
 			<!-- Maven -->
 			<dependency>
@@ -673,7 +712,7 @@ limitations under the License.
 			<dependency>
 				<groupId>org.eclipse.osgi</groupId>
 				<artifactId>org.eclipse.osgi</artifactId>
-				<version>3.4.2.R34x_v20080826-1230</version>
+				<version>${version.equinox}</version>
 			</dependency>
 
 			<!-- Auto UI -->
@@ -733,28 +772,34 @@ limitations under the License.
 			</dependency>
 
 			<!-- ActiveMQ -->
-			<dependency>
-				<groupId>org.apache.activemq</groupId>
+			<!--
+				<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>
+				<version>${version.activemq}</version> </dependency>
+			-->
 			<!--
 				<dependency> <groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-pool</artifactId>
+				<artifactId>com.springsource.org.apache.activemq.web</artifactId>
 				<version>${version.activemq}</version> </dependency> <dependency>
 				<groupId>org.apache.activemq</groupId>
-				<artifactId>activemq-optional</artifactId>
+				<artifactId>com.springsource.org.apache.activemq.pool</artifactId>
 				<version>${version.activemq}</version> </dependency>
 			-->
-			<dependency>
-				<groupId>org.apache.xbean</groupId>
+			<!--
+				<dependency> <groupId>org.apache.xbean</groupId>
 				<artifactId>com.springsource.org.apache.xbean.spring</artifactId>
-				<version>3.3.0</version>
+				<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.2</version>
+			</dependency>
+
+			<dependency>
+				<groupId>org.apache.camel</groupId>
+				<artifactId>com.springsource.org.apache.camel</artifactId>
+				<version>1.3.0</version>
 			</dependency>
 
 		</dependencies>