X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=c4a2c98e06e3ae3f84e3a40d95a162e1e06309ac;hb=36862e777231ee8beecf4d5c7081fdfb8e28cfbd;hp=51aca0eac1c3f166bb5503fcce1e7ba298437f61;hpb=62a87e0195f69747aa5168ebecfebd8626442ba8;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 51aca0eac..c4a2c98e0 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.3.4-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -26,54 +26,66 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
 							org.argeo.security.*
 						</Export-Package>
+						<!-- 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>
 			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
-		<!-- Spring LDAP -->
 		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>org.springframework.ldap</artifactId>
-			<version>1.3.0.RELEASE</version>
+			<groupId>org.argeo.commons.basic</groupId>
+			<artifactId>org.argeo.basic.nodeps</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.ldap</groupId>
-			<artifactId>org.springframework.ldap.core.simple</artifactId>
-			<version>1.3.0.RELEASE</version>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
 		</dependency>
 
-		<!-- Security -->
+		<!-- Crypto -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.argeo.dep.osgi</groupId> -->
+		<!-- <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId> -->
+		<!-- </dependency> -->
+
+		<!-- Spring -->
 		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.beans</artifactId>
 		</dependency>
-
-		<!-- JSON  -->
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
-			<version>1.0.0</version>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.context</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>com.springsource.json</groupId>
-			<artifactId>com.springsource.json</artifactId>
-			<version>1.0.1.RELEASE</version>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>org.springframework.security.core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>com.springsource.org.antlr</artifactId>
+			<groupId>org.springframework</groupId>
+			<artifactId>org.springframework.transaction</artifactId>
+		</dependency>
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
-
-
 
 		<!-- TEST -->
 		<dependency>
@@ -81,6 +93,24 @@
 			<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.4-SNAPSHOT</version>
+			<type>pom</type>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.json</artifactId>
+			<version>0.3.4-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.springsource.json</groupId>
+			<artifactId>com.springsource.json</artifactId>
+			<scope>test</scope>
+		</dependency>
 
 	</dependencies>
 </project>