From de15095e632ef35b52fd169e590ed1d546d0bcff Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 23 Oct 2012 12:37:36 +0000
Subject: [PATCH] Make bcprov optional

git-svn-id: https://svn.argeo.org/commons/trunk@5635 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../runtime/org.argeo.security.core/pom.xml    | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index 5f50851bb..4b766ef17 100644
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -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>
@@ -70,6 +61,7 @@
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
 			<artifactId>bcprov</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.tp</groupId>
-- 
2.30.2