X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=194e3535e07c4217db3ce61b364f2176864cd1c0;hb=374bb3a9dcc8bd5388664a0e41b827050cef7675;hp=37c7390ec2d5bf182bb560a41694a0be02995c83;hpb=526b7be88e2ca2ec5b6398f449894c0f46bc3fc8;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 37c7390ec..194e3535e 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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.2.2-SNAPSHOT</version>
+		<version>2.1.4</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -25,23 +26,19 @@
 			<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.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,
+						<!-- We need to exclude some packages which are added by BND but cause 
+							use package conflict with some deployments -->
+						<Import-Package>
+							org.bouncycastle.*;resolution:=optional,
+							javax.jcr.security,
+							*,
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -50,92 +47,92 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.nodeps</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.util</artifactId>
+			<version>2.1.4</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>
+			<groupId>org.argeo.commons.server</groupId>
+			<artifactId>org.argeo.server.jcr</artifactId>
+			<version>2.1.4</version>
 		</dependency>
 
-		<!-- Spring -->
+		<!-- Crypto -->
 		<dependency>
-				<groupId>org.argeo.dep.osgi</groupId>
-				<artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>bcprov</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.transaction</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>org.springframework.security.core</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.commons.codec</artifactId>
 		</dependency>
 
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-		</dependency>
+		<!-- Spring -->
 		<dependency>
-			<groupId>org.apache.log4j</groupId>
-			<artifactId>com.springsource.org.apache.log4j</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>com.springsource.slf4j.log4j</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.beans</artifactId>
 		</dependency>
-
-		<!-- JSON  -->
 		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.context</artifactId>
 		</dependency>
-
 		<dependency>
-			<groupId>com.springsource.json</groupId>
-			<artifactId>com.springsource.json</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.security.core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.antlr</groupId>
-			<artifactId>com.springsource.org.antlr</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.springframework.transaction</artifactId>
 		</dependency>
 
-		<!-- JMS -->
+		<!-- OSGi -->
 		<dependency>
-			<groupId>org.argeo.dep.osgi</groupId>
-			<artifactId>org.argeo.dep.osgi.activemq</artifactId>
-			<optional>true</optional>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>provided</scope>
 		</dependency>
+
+		<!-- Logging -->
 		<dependency>
-			<groupId>javax.jms</groupId>
-			<artifactId>com.springsource.javax.jms</artifactId>
-			<optional>true</optional>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>slf4j.org.apache.commons.logging</artifactId>
 		</dependency>
+
 		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>org.springframework.jms</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.apache.log4j</artifactId>
 			<optional>true</optional>
 		</dependency>
 
 		<!-- TEST -->
 		<dependency>
-			<groupId>org.junit</groupId>
-			<artifactId>com.springsource.junit</artifactId>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.dep.log4j</artifactId>
+			<version>2.1.4</version>
+			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.json</artifactId>
-			<version>0.2.2-SNAPSHOT</version>
+			<version>2.1.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>com.springsource.json</artifactId>
 			<scope>test</scope>
 		</dependency>
 
 	</dependencies>
-</project>
+</project>
\ No newline at end of file