Merge branch '8.0.x' into 'master'

bonitasoft · Dec 11, 2023 · 736972d · 736972d
2 parents f2aa0c0 + 5c0a1bf
commit 736972d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/bonita-engine/build.gradle b/bonita-engine/build.gradle
@@ -101,19 +101,23 @@ dependencyManagement {
         // Specify woodstox version to override the version pulled by jackson-dataformat-xml (transitive dep of restlet)
         dependency "com.fasterxml.woodstox:woodstox-core:${Deps.woodstoxCoreVersion}"
         dependency "com.googlecode.json-simple:json-simple:${Deps.jsonSimpleVersion}"
-        dependency("org.keycloak:keycloak-servlet-filter-adapter:${Deps.keycloakVersion}") {
-            exclude "org.bouncycastle:bcprov-jdk15on"
-        }
+        dependency "org.keycloak:keycloak-saml-adapter-api-public:${Deps.keycloakVersion}"
         dependency("org.keycloak:keycloak-saml-servlet-filter-adapter:${Deps.keycloakVersion}") {
             exclude "org.bouncycastle:bcprov-jdk15on"
+            exclude "org.bouncycastle:bcpkix-jdk15on"
+            exclude "org.bouncycastle:bcutil-jdk15on"
             exclude "org.apache.santuario:xmlsec"
         }
         dependency("org.keycloak:keycloak-adapter-core:${Deps.keycloakVersion}") {
             exclude "org.bouncycastle:bcprov-jdk15on"
         }
-        dependency "org.keycloak:keycloak-saml-adapter-api-public:${Deps.keycloakVersion}"
+        dependency("org.keycloak:keycloak-servlet-filter-adapter:${Deps.keycloakVersion}") {
+            exclude "org.bouncycastle:bcprov-jdk15on"
+        }
         dependency "org.apache.santuario:xmlsec:${Deps.xmlsecVersion}"
-        dependency "org.bouncycastle:bcprov-jdk18on:${Deps.bcprovVersion}"
+        dependency "org.bouncycastle:bcprov-jdk18on:${Deps.bouncyCastleVersion}"
+        dependency "org.bouncycastle:bcpkix-jdk18on:${Deps.bouncyCastleVersion}"
+        dependency "org.bouncycastle:bcutil-jdk18on:${Deps.bouncyCastleVersion}"
         dependency "org.codelibs:spnego:${Deps.spnegoVersion}"
     }
 }

diff --git a/buildSrc/src/main/groovy/Deps.groovy b/buildSrc/src/main/groovy/Deps.groovy
@@ -69,7 +69,7 @@ class Deps {
     public static String woodstoxStax2ApiVersion = "3.1.4"
     public static String keycloakVersion = "21.1.2"
     public static String xmlsecVersion = "2.2.6"
-    public static String bcprovVersion = "1.77"
+    public static String bouncyCastleVersion = "1.77"
     public static String spnegoVersion = "1.1.1"
 
     // Test dependency versions: