diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-20 08:46:32 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-02-20 08:46:32 +0100 |
| commit | fb294d6394ef5d13590d2ed1b061a589f066e3da (patch) | |
| tree | daeef6e212d477cfc9287287de9c3e38665ca08a | |
| parent | 45c5e41898ea4660154d730cf863ee2886f71a03 (diff) | |
| download | moa-id-spss-fb294d6394ef5d13590d2ed1b061a589f066e3da.tar.gz moa-id-spss-fb294d6394ef5d13590d2ed1b061a589f066e3da.tar.bz2 moa-id-spss-fb294d6394ef5d13590d2ed1b061a589f066e3da.zip | |
fix possible problem with different bouncycastle versions
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 9 | ||||
| -rw-r--r-- | id/server/stork2-commons/pom.xml | 1 | ||||
| -rw-r--r-- | pom.xml | 6 |
3 files changed, 15 insertions, 1 deletions
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 --> @@ -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>
|