summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-12-03 15:40:55 (GMT)
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-12-03 15:40:55 (GMT)
commit01b02f8f787a2f91737632134b2d4e227741124c (patch)
tree8d2576a684ba244ccf2c412b1ee887bdcffcf2cf
parentcfe0dce2c3482cf1e63a4962b5c9fb8588aa2d44 (diff)
downloadmocca-01b02f8f787a2f91737632134b2d4e227741124c.zip
mocca-01b02f8f787a2f91737632134b2d4e227741124c.tar.gz
mocca-01b02f8f787a2f91737632134b2d4e227741124c.tar.bz2
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
-rw-r--r--BKULocal/pom.xml4
-rw-r--r--BKUOnline/pom.xml4
-rw-r--r--BKUWebStart/pom.xml2
-rw-r--r--bkucommon/pom.xml6
-rw-r--r--pom.xml24
-rw-r--r--smcc/pom.xml4
-rw-r--r--smccTest/pom.xml6
-rw-r--r--utils/pom.xml4
8 files changed, 35 insertions, 19 deletions
diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index b414a60..5bac5d5 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 90ee52b..4bcb750 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 887a0b1..84207f1 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 7720238..6c2de4e 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 5a2b24e..e053faa 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 3e23106..9f084bb 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 526cc24..57a777a 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 667d1b4..35ef3ee 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>