X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=b6edaf87d55f582e1f591c8b5d3d334dde9698bf;hb=cdfd09387221a87b3a36f54fd3d5e8a6f4279baf;hp=d5a031d17d5cd698d64a8dd72aaabeb1e367b037;hpb=7c9ba14fbe8cd771af9d205c7988507c1dd7abb6;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 d5a031d17..b6edaf87d 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.1-SNAPSHOT</version>
+		<version>0.1.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -32,6 +32,10 @@
 						<Export-Package>
 							org.argeo.security.*
 						</Export-Package>
+						<Import-Package>*,
+							org.argeo.server.json;resolution:=optional,
+							org.springframework.ldap.core.support;resolution:=optional
+						</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -40,31 +44,66 @@
 	<dependencies>
 		<!-- Spring LDAP -->
 		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>org.springframework.ldap</artifactId>
-			<version>1.3.0.RELEASE</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>org.springframework.ldap.core.simple</artifactId>
-			<version>1.3.0.RELEASE</version>
+			<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>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>org.springframework.security</artifactId>
 		</dependency>
 
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.log4j</artifactId>
+		</dependency>
+
+		<!-- JSON  -->
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
+		</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>
 
+		<!-- TEST -->
+		<dependency>
+			<groupId>org.junit</groupId>
+			<artifactId>com.springsource.junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.json</artifactId>
+			<version>0.1.2-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 </project>