X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fpom.xml;h=4b766ef17b8489c1512356a68fa3273ee9d47a10;hb=644f7559c3aa7f640b39e26c5fb6d32a27de6342;hp=75e7b7986856936b84281945f7e5c90eeeb256d9;hpb=647c35c779b32caa54bb547d32503eeb6135396c;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 75e7b7986..4b766ef17 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -1,10 +1,11 @@
 <?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">
+<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</version>
+		<version>1.1.5-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.argeo.security.core</artifactId>
@@ -36,18 +37,8 @@
 						<!-- 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,
-							*
+							org.bouncycastle.*;resolution:=optional,
+							*,
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -58,18 +49,19 @@
 		<dependency>
 			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.util</artifactId>
-			<version>1.1.4</version>
+			<version>1.1.5-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons.server</groupId>
 			<artifactId>org.argeo.server.jcr</artifactId>
-			<version>1.1.4</version>
+			<version>1.1.5-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Crypto -->
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>bcprov</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
@@ -126,14 +118,14 @@
 		<dependency>
 			<groupId>org.argeo.commons.base</groupId>
 			<artifactId>org.argeo.dep.log4j</artifactId>
-			<version>1.1.4</version>
+			<version>1.1.5-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</version>
+			<version>1.1.5-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>