From fb294d6394ef5d13590d2ed1b061a589f066e3da Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 20 Feb 2015 08:46:32 +0100
Subject: fix possible problem with different bouncycastle versions

---
 id/ConfigWebTool/pom.xml         | 9 +++++++++
 id/server/stork2-commons/pom.xml | 1 -
 pom.xml                          | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 1ddcf4dc1..827254d00 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -139,9 +139,18 @@
 								<groupId>xalan</groupId>
 								<artifactId>*</artifactId>
 							</exclusion>
+							<exclusion>
+								<groupId>org.bouncycastle</groupId>
+								<artifactId>bcprov-jdk15on</artifactId>
+							</exclusion>
 						</exclusions>
         </dependency>
 
+				<dependency>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcprov-jdk16</artifactId>
+				</dependency>
+
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index dc9c22515..81f2cf4e5 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -92,7 +92,6 @@
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk16</artifactId>
-			<version>1.46</version>
 		</dependency>
 
 		<!-- Servlet API -->
diff --git a/pom.xml b/pom.xml
index c3d6f9630..2d37d9f11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,12 @@
             </dependency> -->
 
 
+						<dependency>
+							<groupId>org.bouncycastle</groupId>
+							<artifactId>bcprov-jdk16</artifactId>
+							<version>1.46</version>
+						</dependency>
+
             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
-- 
cgit v1.2.3