From c6668a5481e70cafe86b6cc966471159d5e17192 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 4 Aug 2020 14:24:07 +0200
Subject: update third-party libs

---
 eaaf_core_utils/pom.xml                    |  2 +-
 eaaf_modules/eaaf_module_pvp2_core/pom.xml | 14 +++++++++++++-
 pom.xml                                    | 12 ++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/eaaf_core_utils/pom.xml b/eaaf_core_utils/pom.xml
index 181bce1a..19d5f32e 100644
--- a/eaaf_core_utils/pom.xml
+++ b/eaaf_core_utils/pom.xml
@@ -53,7 +53,7 @@
     </dependency>    
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bctls-jdk15on</artifactId>
+      <artifactId>bctls-jdk15to18</artifactId>
     </dependency>
     
     <dependency>
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index 3704e049..7372db81 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -33,10 +33,22 @@
     <dependency>
       <groupId>org.opensaml</groupId>
       <artifactId>opensaml-xmlsec-api</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.opensaml</groupId>
       <artifactId>opensaml-xmlsec-impl</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.bouncycastle</groupId>
+          <artifactId>bcprov-jdk15on</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.santuario</groupId>
@@ -44,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk15on</artifactId>
+      <artifactId>bcprov-jdk15to18</artifactId>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index ca90543d..9a9c6d45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,8 +50,8 @@
     <org.springframework.version>5.2.8.RELEASE</org.springframework.version>
     <org.opensaml.version>3.4.5</org.opensaml.version>
     <org.apache.santuario.xmlsec.version>2.2.0</org.apache.santuario.xmlsec.version>
-    <org.bouncycastle.bcprov-jdk15on.version>1.66</org.bouncycastle.bcprov-jdk15on.version>
-    <org.bouncycastle.bctls-jdk15on.version>1.66</org.bouncycastle.bctls-jdk15on.version>
+    <org.bouncycastle.bcprov-jdk15to18.version>1.66</org.bouncycastle.bcprov-jdk15to18.version>
+    <org.bouncycastle.bctls-jdk15to18.version>1.66</org.bouncycastle.bctls-jdk15to18.version>
 
     <org.slf4j.version>1.7.30</org.slf4j.version>
     <commons-codec.version>1.14</commons-codec.version>
@@ -426,13 +426,13 @@
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk15on</artifactId>
-        <version>${org.bouncycastle.bcprov-jdk15on.version}</version>
+        <artifactId>bcprov-jdk15to18</artifactId>
+        <version>${org.bouncycastle.bcprov-jdk15to18.version}</version>
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bctls-jdk15on</artifactId>
-        <version>${org.bouncycastle.bctls-jdk15on.version}</version>      
+        <artifactId>bctls-jdk15to18</artifactId>
+        <version>${org.bouncycastle.bctls-jdk15to18.version}</version>      
       </dependency>
 
       <dependency>
-- 
cgit v1.2.3