From 01b02f8f787a2f91737632134b2d4e227741124c Mon Sep 17 00:00:00 2001
From: tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 3 Dec 2012 15:40:55 +0000
Subject: Don't use signed jce/ecc libs  * Workaround for OpenJDK 7 under
 Ubuntu 12.10  * Also bump to latest JCE/ECC version

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1153 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/pom.xml    |  4 ++--
 BKUOnline/pom.xml   |  4 ++--
 BKUWebStart/pom.xml |  2 +-
 bkucommon/pom.xml   |  6 +++---
 pom.xml             | 24 ++++++++++++++++++++----
 smcc/pom.xml        |  4 ++--
 smccTest/pom.xml    |  6 +++---
 utils/pom.xml       |  4 ++--
 8 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b414a60d..5bac5d5d 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -148,11 +148,11 @@
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
+      <artifactId>iaik_jce_full</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_ecc_signed</artifactId>
+      <artifactId>iaik_ecc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 90ee52bf..4bcb7504 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -53,11 +53,11 @@
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
+      <artifactId>iaik_jce_full</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_ecc_signed</artifactId>
+      <artifactId>iaik_ecc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/BKUWebStart/pom.xml b/BKUWebStart/pom.xml
index 887a0b17..84207f1c 100644
--- a/BKUWebStart/pom.xml
+++ b/BKUWebStart/pom.xml
@@ -289,7 +289,7 @@
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
+      <artifactId>iaik_jce_full</artifactId>
       <scope>compile</scope>
     </dependency>
     
diff --git a/bkucommon/pom.xml b/bkucommon/pom.xml
index 77202387..6c2de4eb 100644
--- a/bkucommon/pom.xml
+++ b/bkucommon/pom.xml
@@ -61,11 +61,11 @@
 
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
+      <artifactId>iaik_jce_full</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_ecc_signed</artifactId>
+      <artifactId>iaik_ecc</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-fileupload</groupId>
@@ -144,4 +144,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 5a2b24ed..e053faac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,10 +293,16 @@
         <artifactId>xalan</artifactId>
         <version>2.7.1</version>
       </dependency>
-      <dependency>
+      <!--dependency>
         <groupId>iaik</groupId>
         <artifactId>iaik_jce_full_signed</artifactId>
-        <version>3.16</version>
+        <version>5.01</version>
+        <scope>compile</scope>
+      </dependency-->
+      <dependency>
+        <groupId>iaik</groupId>
+        <artifactId>iaik_jce_full</artifactId>
+        <version>5.01</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -304,11 +310,21 @@
         <artifactId>iaik_jce_me4se</artifactId>
         <version>3.04</version>
       </dependency>
-      <dependency>
+      <!--dependency>
         <groupId>iaik</groupId>
         <artifactId>iaik_ecc_signed</artifactId>
-        <version>2.15</version>
+        <version>2.19</version>
+      </dependency-->
+      <dependency>
+        <groupId>iaik</groupId>
+        <artifactId>iaik_ecc</artifactId>
+        <version>2.19</version>
       </dependency>
+      <!--dependency>
+        <groupId>iaik</groupId>
+        <artifactId>iaik_xsect_signed</artifactId>
+        <version>1.17</version>
+      </dependency-->
       <dependency>
         <groupId>iaik</groupId>
         <artifactId>iaik_xsect</artifactId>
diff --git a/smcc/pom.xml b/smcc/pom.xml
index 3e231061..9f084bbd 100644
--- a/smcc/pom.xml
+++ b/smcc/pom.xml
@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
+      <artifactId>iaik_jce_full</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -45,4 +45,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/smccTest/pom.xml b/smccTest/pom.xml
index 526cc243..57a777ae 100644
--- a/smccTest/pom.xml
+++ b/smccTest/pom.xml
@@ -55,11 +55,11 @@
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
+      <artifactId>iaik_jce_full</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_ecc_signed</artifactId>
+      <artifactId>iaik_ecc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -70,4 +70,4 @@
       <artifactId>log4j</artifactId>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/utils/pom.xml b/utils/pom.xml
index 667d1b4e..35ef3ee0 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -16,11 +16,11 @@
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_jce_full_signed</artifactId>
+      <artifactId>iaik_jce_full</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-      <artifactId>iaik_ecc_signed</artifactId>
+      <artifactId>iaik_ecc</artifactId>
     </dependency>
     <dependency>
       <groupId>iaik</groupId>
-- 
cgit v1.2.3