Merge branch 'master' into dev

bonitasoft · Dec 7, 2023 · 5a7d484 · 5a7d484
2 parents 657b7c6 + f2aa0c0
commit 5a7d484
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 11 deletions.
diff --git a/bonita-engine-standalone/build.gradle b/bonita-engine-standalone/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
     testImplementation "org.postgresql:postgresql:${Deps.postgresqlVersion}"
-    testImplementation "mysql:mysql-connector-java:${Deps.mysqlVersion}"
+    testImplementation "com.mysql:mysql-connector-j:${Deps.mysqlVersion}"
     testImplementation "com.h2database:h2:${Deps.h2Version}"
 
 }

diff --git a/bonita-engine/build.gradle b/bonita-engine/build.gradle
@@ -102,12 +102,18 @@ dependencyManagement {
         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-servlet-filter-adapter:${Deps.keycloakVersion}") {
+            exclude "org.bouncycastle:bcprov-jdk15on"
             exclude "org.apache.santuario:xmlsec"
         }
-        dependency "org.apache.santuario:xmlsec:${Deps.xmlsecVersion}"
-        dependency "org.keycloak:keycloak-saml-servlet-filter-adapter:${Deps.keycloakVersion}"
+        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-adapter-core:${Deps.keycloakVersion}"
+        dependency "org.apache.santuario:xmlsec:${Deps.xmlsecVersion}"
+        dependency "org.bouncycastle:bcprov-jdk18on:${Deps.bcprovVersion}"
         dependency "org.codelibs:spnego:${Deps.spnegoVersion}"
     }
 }

diff --git a/bonita-integration-tests/benchmarks/build.gradle b/bonita-integration-tests/benchmarks/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     api "org.mockito:mockito-core:${Deps.mockitoVersion}"
     api project(':bonita-integration-tests:bonita-integration-tests-client')
     api project(':bpm:bonita-server')
-    runtimeOnly "mysql:mysql-connector-java:${Deps.mysqlVersion}"
+    runtimeOnly "com.mysql:mysql-connector-j:${Deps.mysqlVersion}"
     runtimeOnly "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}"
     runtimeOnly "org.postgresql:postgresql:${Deps.postgresqlVersion}"
     testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}"

diff --git a/bonita-integration-tests/bonita-integration-tests-local/build.gradle b/bonita-integration-tests/bonita-integration-tests-local/build.gradle
@@ -10,7 +10,7 @@ dependencies {
     implementation(project(":bpm:bonita-core:bonita-process-engine"))
     api project(':bpm:bonita-server')
     api "commons-io:commons-io:${Deps.commonsIOVersion}"
-    runtimeOnly "mysql:mysql-connector-java:${Deps.mysqlVersion}"
+    runtimeOnly "com.mysql:mysql-connector-j:${Deps.mysqlVersion}"
     runtimeOnly "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}"
     runtimeOnly "org.postgresql:postgresql:${Deps.postgresqlVersion}"
     testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}"

diff --git a/buildSrc/src/main/groovy/Deps.groovy b/buildSrc/src/main/groovy/Deps.groovy
@@ -38,15 +38,15 @@ class Deps {
     public static String quartzVersion = "2.3.2"
     public static String micrometerVersion = "1.6.1"
 
-    public static String mysqlVersion = "8.0.29"
+    public static String mysqlVersion = "8.2.0"
     public static String mssqlVersion = "8.4.1.jre8"
     public static String oracleVersion = "19.3.0.0"
     public static String postgresqlVersion = "42.4.3"
     public static String lombokVersion = "1.18.30"
 
     public static String narayanaVersion = "5.10.6.Final"
     public static String jaxbVersion = "2.3.1"
-    public static String logbackVersion = "1.2.12"
+    public static String logbackVersion = "1.2.13"
     public static String javaxAnnotationsVersion = "1.3.2"
 
     // extensions versions
@@ -71,6 +71,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 spnegoVersion = "1.1.1"
 
     // Test dependency versions:

diff --git a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/JdbcDriverDependencies.groovy b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/JdbcDriverDependencies.groovy
@@ -16,7 +16,7 @@ package org.bonitasoft.engine.gradle.docker
 
 class JdbcDriverDependencies {
 
-    final static String mysql = "mysql:mysql-connector-java:${Deps.mysqlVersion}"
+    final static String mysql = "com.mysql:mysql-connector-j:${Deps.mysqlVersion}"
     final static String oracle = "com.oracle.database.jdbc:ojdbc8:${Deps.oracleVersion}"
     final static String postgres = "org.postgresql:postgresql:${Deps.postgresqlVersion}"
     final static String sqlserver = "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}"

diff --git a/platform/platform-setup/build.gradle b/platform/platform-setup/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     api "org.yaml:snakeyaml:${Deps.snakeyamlVersion}"
     api "org.springframework.boot:spring-boot-starter-jdbc:${Deps.springBootVersion}"
     api "org.postgresql:postgresql:${Deps.postgresqlVersion}"
-    api ("mysql:mysql-connector-java:${Deps.mysqlVersion}") {
+    api ("com.mysql:mysql-connector-j:${Deps.mysqlVersion}") {
         exclude(module: 'protobuf-java')
     }
     api "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}"

diff --git a/services/bonita-business-data/bonita-business-data-impl/build.gradle b/services/bonita-business-data/bonita-business-data-impl/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     testImplementation testFixtures(project(':bpm:bonita-common'))
     testRuntimeOnly "org.apache.commons:commons-dbcp2:${Deps.commonsDbcp2Version}"
     testRuntimeOnly "com.h2database:h2:${Deps.h2Version}"
-    testRuntimeOnly "mysql:mysql-connector-java:${Deps.mysqlVersion}"
+    testRuntimeOnly "com.mysql:mysql-connector-j:${Deps.mysqlVersion}"
     testRuntimeOnly "org.postgresql:postgresql:${Deps.postgresqlVersion}"
     testRuntimeOnly "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}"