X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=7facfdb1e115e12a65a03e57009d0177e948213e;hb=d685633924a5ee0328f5053b375564ca8fe969e6;hp=221bdfebd269f90501f6aa88f730754ba557f470;hpb=b5d51f84e3a36a214bcb82dc82da19a123838639;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 221bdfebd..7facfdb1e 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.argeo.commons.security</groupId>
 		<artifactId>runtime</artifactId>
-		<version>0.1.3-SNAPSHOT</version>
+		<version>0.2.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -33,8 +33,16 @@
 							org.argeo.security.*
 						</Export-Package>
 						<Import-Package>*,
+							org.springframework.context,
 							org.argeo.server.json;resolution:=optional,
-							org.springframework.ldap.core.support;resolution:=optional
+							javax.jms;resolution:=optional,
+							org.apache.activemq;resolution:=optional,
+							org.apache.activemq.broker;resolution:=optional,
+							org.apache.activemq.command;resolution:=optional,
+							org.apache.activemq.security;resolution:=optional,
+							org.springframework.jms.connection;resolution:=optional,
+							org.springframework.ldap.core;resolution:=optional,
+							org.springframework.ldap.core.support;resolution:=optional,
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -45,32 +53,24 @@
 		<dependency>
 			<groupId>org.argeo.commons.basic</groupId>
 			<artifactId>org.argeo.basic.nodeps</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<version>0.2.2-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Spring LDAP -->
-		<!--
-			<dependency> <groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-			</dependency>
-		-->
 		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>org.springframework.ldap</artifactId>
+			<!-- Force inclusion of commons.lang to prevent v2.1.0 to be taken by 
+				Spring Security -->
+			<groupId>org.apache.commons</groupId>
+			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
 		</dependency>
+
+		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.transaction</artifactId>
+			<groupId>org.argeo.dep.osgi</groupId>
+			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
 		</dependency>
-
-		<!-- Security -->
 		<dependency>
-			<!--
-				Force inclusion of commons.lang to prevent v2.1.0 to be taken by
-				Spring Security
-			-->
-			<groupId>org.apache.commons</groupId>
-			<artifactId>com.springsource.org.apache.commons.lang</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.transaction</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
@@ -91,7 +91,7 @@
 			<artifactId>com.springsource.slf4j.log4j</artifactId>
 		</dependency>
 
-		<!-- JSON  -->
+		<!-- JSON -->
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
@@ -110,7 +110,23 @@
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.activemq</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.jms</groupId>
+			<artifactId>com.springsource.javax.jms</artifactId>
+			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.jms</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+<!--		<dependency>-->
+<!--			<groupId>org.apache.commons</groupId>-->
+<!--			<artifactId>com.springsource.org.apache.commons.codec</artifactId>-->
+<!--		</dependency>-->
 
 		<!-- TEST -->
 		<dependency>
@@ -121,7 +137,7 @@
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.json</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<version>0.2.2-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>