X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=146fa435484b2242c3b17d02081fa5b9fc16a39d;hb=cb03e53c0ae1087fd3021f2e0051f7f191ddf84f;hp=44b512ac5517c108a4b87ccf00ed77bd6eb3417c;hpb=2101bfb7ae055b0e18fbb0001e278aeba13af346;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 44b512ac5..146fa4354 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.3-SNAPSHOT</version>
+		<version>0.3.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -26,15 +25,28 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
+						<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
 						<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",
+							javax.jcr.security,
+							javax.jcr.nodetype,
+							javax.jcr.version,
+							javax.jcr.observation,
+							javax.jcr.query,
+							javax.jcr.lock,
+							javax.jcr.retention,
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -42,54 +54,50 @@
 		</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.5-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr</artifactId>
+			<version>0.3.5-SNAPSHOT</version>
 		</dependency>
 
+		<!-- Crypto -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.dep.osgi</groupId> -->
+		<!-- <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId> -->
+		<!-- </dependency> -->
 
-		<!-- Security -->
+		<!-- Spring -->
 		<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.beans</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.context</artifactId>
 		</dependency>
-
-		<!-- Logging -->
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>org.springframework.security.core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.log4j</groupId>
-			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.transaction</artifactId>
 		</dependency>
+		<!-- Logging -->
 		<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>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>com.springsource.json</groupId>
-			<artifactId>com.springsource.json</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>com.springsource.org.antlr</artifactId>
+			<groupId>org.apache.log4j</groupId>
+			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- TEST -->
@@ -98,10 +106,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.5-SNAPSHOT</version>
+			<type>pom</type>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.json</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<version>0.3.5-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.springsource.json</groupId>
+			<artifactId>com.springsource.json</artifactId>
 			<scope>test</scope>
 		</dependency>