From 2c11a7cfadafd5894716254f70a1a0a48842ecc6 Mon Sep 17 00:00:00 2001
From: Enrico Vianello <enrico.vianello@cnaf.infn.it>
Date: Mon, 13 Nov 2023 18:18:24 +0100
Subject: [PATCH] Back to bouncycastle v1.58

Aligned with voms-api-java version
---
 iam-login-service/pom.xml |  9 ++-------
 iam-test-client/pom.xml   |  7 +------
 iam-voms-aa/pom.xml       |  9 ++-------
 pom.xml                   | 14 ++++----------
 4 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/iam-login-service/pom.xml b/iam-login-service/pom.xml
index 688d4221e..e094207d3 100644
--- a/iam-login-service/pom.xml
+++ b/iam-login-service/pom.xml
@@ -279,17 +279,12 @@
     <!-- SAML -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk18on</artifactId>
+      <artifactId>bcpkix-jdk15on</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk18on</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcutil-jdk18on</artifactId>
+      <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
 
     <dependency>
diff --git a/iam-test-client/pom.xml b/iam-test-client/pom.xml
index 61fa5037c..414702fb9 100644
--- a/iam-test-client/pom.xml
+++ b/iam-test-client/pom.xml
@@ -38,12 +38,7 @@
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk18on</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcutil-jdk18on</artifactId>
+      <artifactId>bcpkix-jdk15on</artifactId>
     </dependency>
 
     <dependency>
diff --git a/iam-voms-aa/pom.xml b/iam-voms-aa/pom.xml
index c39aa0bf8..eb85937c4 100644
--- a/iam-voms-aa/pom.xml
+++ b/iam-voms-aa/pom.xml
@@ -148,17 +148,12 @@
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk18on</artifactId>
+      <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk18on</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcutil-jdk18on</artifactId>
+      <artifactId>bcpkix-jdk15on</artifactId>
     </dependency>
 
     <dependency>
diff --git a/pom.xml b/pom.xml
index b38c68c51..2ee23ab42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
     <testcontainers.version>1.16.2</testcontainers.version>
 
-    <mitreid.version>1.3.6.cnaf-20231030</mitreid.version>
+    <mitreid.version>1.3.6.cnaf-20231113</mitreid.version>
     <spring-security-oauth2.version>2.5.2.RELEASE</spring-security-oauth2.version>
 
     <voms.version>3.3.2</voms.version>
@@ -83,7 +83,7 @@
     <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
     <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
 
-    <bouncycastle.version>1.76</bouncycastle.version>
+    <bouncycastle.version>1.58</bouncycastle.version>
 
     <resource.delimiter>@</resource.delimiter>
 
@@ -217,19 +217,13 @@
 
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk18on</artifactId>
+        <artifactId>bcpkix-jdk15on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk18on</artifactId>
-        <version>${bouncycastle.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcutil-jdk18on</artifactId>
+        <artifactId>bcprov-jdk15on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>