X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=d7da56b0c780b21e80619f1b548bf6424c0e7d6d;hb=3a398c06f6e5cd446bacc8d28fbf34788a60c71f;hp=7207ab58cfa658cb9473505aaa5e5772f9994820;hpb=d4965ca4ec8fc5489bd947a36b3435a9ffec74d0;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 7207ab58c..d7da56b0c 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">
+<?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>1.1.4-SNAPSHOT</version>
+		<version>2.1.11-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -35,18 +36,9 @@
 						<!-- 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",
+							org.bouncycastle.*;resolution:=optional,
 							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>
@@ -55,21 +47,22 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.nodeps</artifactId>
-			<version>1.1.4-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.util</artifactId>
+			<version>2.1.11-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jcr</artifactId>
-			<version>1.1.4-SNAPSHOT</version>
+			<version>2.1.11-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Crypto -->
-		<!-- <dependency> -->
-		<!-- <groupId>org.argeo.dep.osgi</groupId> -->
-		<!-- <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId> -->
-		<!-- </dependency> -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>bcprov</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.apache.commons.codec</artifactId>
@@ -96,6 +89,14 @@
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>org.springframework.transaction</artifactId>
 		</dependency>
+
+		<!-- OSGi -->
+		<dependency>
+			<groupId>org.argeo.tp</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -115,16 +116,16 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.argeo.commons.basic</groupId>
-			<artifactId>org.argeo.basic.dep.log4j</artifactId>
-			<version>1.1.4-SNAPSHOT</version>
+			<groupId>org.argeo.commons.base</groupId>
+			<artifactId>org.argeo.dep.log4j</artifactId>
+			<version>2.1.11-SNAPSHOT</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.json</artifactId>
-			<version>1.1.4-SNAPSHOT</version>
+			<version>2.1.11-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>