X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=c823b8f1c7df1117cdbf03eafdeb02f0f8359c94;hb=31c1b93cf0c3d198a07251bf828fee253afef94d;hp=5f9cc85c515489de17521052d6e2723097f2c555;hpb=a92bbf66e3eab0e209cbaf52616fde01fae3d3b3;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 5f9cc85c5..c823b8f1c 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.argeo.commons.security</groupId>
 		<artifactId>runtime</artifactId>
-		<version>0.1.2-SNAPSHOT</version>
+		<version>0.3.2</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -31,9 +31,14 @@
 						<Export-Package>
 							org.argeo.security.*
 						</Export-Package>
-						<Import-Package>*,
-							org.argeo.server.json;resolution:=optional,
-							org.springframework.ldap.core.support;resolution:=optional
+						<!-- We need to exclude some packages which are added by BND but cause 
+							use package conflict with some deployments -->
+						<Import-Package>
+							org.springframework.context,
+							org.springframework.beans.factory,
+							org.argeo.jcr,
+							org.xml.sax;version="0.0.0",
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -41,45 +46,38 @@
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Spring LDAP -->
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.nodeps</artifactId>
+			<version>0.3.2</version>
 		</dependency>
-
-		<!-- Security -->
 		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security</artifactId>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr</artifactId>
+			<version>0.3.2</version>
 		</dependency>
 
-		<!-- Logging -->
+		<!-- Spring -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.beans</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.log4j</groupId>
-			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.context</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.log4j</artifactId>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>org.springframework.security.core</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>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.transaction</artifactId>
 		</dependency>
+		<!-- Logging -->
 		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>com.springsource.org.antlr</artifactId>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
 
 		<!-- TEST -->
@@ -88,10 +86,22 @@
 			<artifactId>com.springsource.junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.dep.log4j</artifactId>
+			<version>0.3.2</version>
+			<type>pom</type>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.json</artifactId>
-			<version>0.1.2-SNAPSHOT</version>
+			<version>0.3.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.springsource.json</groupId>
+			<artifactId>com.springsource.json</artifactId>
 			<scope>test</scope>
 		</dependency>