Make bcprov optional

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / pom.xml

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index abb559ad784a1a35dca62338352e569a6104a339..4b766ef17b8489c1512356a68fa3273ee9d47a10 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -5,7 +5,7 @@
        <parent>
                <groupId>org.argeo.commons.security</groupId>
                <artifactId>runtime</artifactId>
-               <version>1.1.4-SNAPSHOT</version>
+               <version>1.1.5-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.security.core</artifactId>
@@ -37,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>
@@ -59,19 +49,20 @@
                <dependency>
                        <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.util</artifactId>
-                       <version>1.1.4-SNAPSHOT</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-SNAPSHOT</version>
+                       <version>1.1.5-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>
@@ -127,14 +118,14 @@
                <dependency>
                        <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.dep.log4j</artifactId>
-                       <version>1.1.4-SNAPSHOT</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-SNAPSHOT</version>
+                       <version>1.1.5-SNAPSHOT</version>
                        <scope>test</scope>
                </dependency>
                <dependency>