X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=d818139ab2c897deea6c387269cf0468aac714b9;hb=b9055440fe63bc6f31c0f132e6f372775ac0469c;hp=0b103ee238d54416fe95b7ad1f170f90801b6790;hpb=38ba7a02ad1cbab307987a92417762923a55a6b2;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 0b103ee23..d818139ab 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.argeo.commons.security</groupId>
 		<artifactId>runtime</artifactId>
-		<version>0.1.1-SNAPSHOT</version>
+		<version>0.2.2</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -32,23 +31,49 @@
 						<Export-Package>
 							org.argeo.security.*
 						</Export-Package>
+						<Import-Package>*,
+							org.springframework.context,
+							org.argeo.server.json;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>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Spring LDAP -->
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.nodeps</artifactId>
+			<version>0.2.2</version>
+		</dependency>
+
+		<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>
+		</dependency>
+
+		<!-- Spring -->
 		<dependency>
 			<groupId>org.argeo.dep.osgi</groupId>
 			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-			<version>1.3.0.0003-SNAPSHOT</version>
 		</dependency>
-
-		<!-- Security -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.transaction</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security</artifactId>
+			<artifactId>org.springframework.security.core</artifactId>
 		</dependency>
 
 		<!-- Logging -->
@@ -65,24 +90,42 @@
 			<artifactId>com.springsource.slf4j.log4j</artifactId>
 		</dependency>
 
-		<!-- JSON  -->
+		<!-- JSON -->
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.springsource.json</groupId>
 			<artifactId>com.springsource.json</artifactId>
-			<version>1.0.1.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>com.springsource.org.antlr</artifactId>
 		</dependency>
 
+		<!-- JMS -->
+		<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>
@@ -90,6 +133,12 @@
 			<artifactId>com.springsource.junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.json</artifactId>
+			<version>0.2.2</version>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 </project>