diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-19 13:24:22 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-19 13:24:22 +0200 |
commit | 83dc74e60a4d9031285ac27aa0661fe0c26485e0 (patch) | |
tree | 10121ca0a4e2d799383a921fbaf72693bb1f7f5f /id/server/stork2-saml-engine | |
parent | 00677e1478fa2a33ec22b06b5c5180b965e2c9f2 (diff) | |
parent | 4c6e440ba41767653a2082fd92e8eeae6c3a6c1a (diff) | |
download | moa-id-spss-MOA-ID-2.1.1.tar.gz moa-id-spss-MOA-ID-2.1.1.tar.bz2 moa-id-spss-MOA-ID-2.1.1.zip |
Merge branch 'moa-2.1-Snapshot'MOA-SPSS-2.0.2MOA-ID-2.1.1
Diffstat (limited to 'id/server/stork2-saml-engine')
-rw-r--r-- | id/server/stork2-saml-engine/pom.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml index 89ddab22a..30f2bff7c 100644 --- a/id/server/stork2-saml-engine/pom.xml +++ b/id/server/stork2-saml-engine/pom.xml @@ -49,12 +49,12 @@ <groupId>eu.stork</groupId>
<artifactId>Commons</artifactId>
<version>${commons.version}</version>
- <exclusions>
+<!-- <exclusions>
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</exclusion>
- </exclusions>
+ </exclusions> -->
</dependency>
<dependency>
@@ -82,6 +82,10 @@ <groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ </exclusion>
</exclusions>
</dependency>
|