Merge remote-tracking branch 'origin/master' into dev

bonitasoft · Oct 16, 2024 · 6bf7ee0 · 6bf7ee0
2 parents 7534f16 + 821619a
commit 6bf7ee0
Show file tree

Hide file tree

Showing 71 changed files with 311 additions and 241 deletions.
diff --git a/bonita-engine-spring-boot-starter/build.gradle b/bonita-engine-spring-boot-starter/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     annotationProcessor(libs.springBootConfigurationProcessor)
 
     testImplementation(libs.springBootTest)
-    testImplementation("org.assertj:assertj-core:${Deps.assertjVersion}")
+    testImplementation(libs.assertj)
 }
 
 tasks.register("sourcesJar", Jar) {

diff --git a/bonita-engine-standalone/build.gradle b/bonita-engine-standalone/build.gradle
@@ -21,8 +21,8 @@ dependencies {
     annotationProcessor libs.lombok
     compileOnly libs.lombok
 
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
+    testImplementation libs.assertj
+    testImplementation libs.systemRules
 
     // These 3 drivers are used for some specific tests:
     testImplementation(libs.postgresql)

diff --git a/bonita-engine/build.gradle b/bonita-engine/build.gradle
@@ -88,40 +88,40 @@ dependencyManagement {
         dependency "com.bonitasoft.web:bonita-web-extensions-sp:${project.version}"
 
         // Web layer specific dependencies:
-        dependency "org.apache.xbean:xbean-classloader:${Deps.xbeanClassloaderVersion}"
-        dependency "org.glassfish.web:jakarta.servlet.jsp.jstl:${Deps.jakartaJstlVersion}"
-        dependency "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:${Deps.jakartaJstlApiVersion}"
-        dependency "org.fedorahosted.tennera:jgettext:${Deps.jgettextVersion}"
-        dependency "org.tuckey:urlrewritefilter:${Deps.urlrewriteVersion}"
-        dependency "org.restlet.jse:org.restlet:${Deps.restletVersion}"
-        dependency("org.restlet.jee:org.restlet.ext.servlet:${Deps.restletVersion}") {
+        dependency(libs.xbeanClassloader.get() as String)
+        dependency(libs.jakartaJstl.get() as String)
+        dependency(libs.jakartaJstlApi.get() as String)
+        dependency(libs.jgettext.get() as String)
+        dependency(libs.urlrewritefilter.get() as String)
+        dependency(libs.restlet.get() as String)
+        dependency(libs.restletServlet.get() as String) {
             exclude "org.restlet.jee:org.restlet"
         }
-        dependency("org.restlet.jse:org.restlet.ext.jackson:${Deps.restletVersion}") {
+        dependency(libs.restletJackson.get() as String) {
             exclude "org.codehaus.woodstox:woodstox-core-asl"
             exclude "org.codehaus.woodstox:stax2-api"
         }
         // 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-saml-adapter-api-public:${Deps.keycloakVersion}"
-        dependency("org.keycloak:keycloak-saml-servlet-filter-adapter:${Deps.keycloakVersion}") {
+        dependency(libs.woodstoxCore.get() as String)
+        dependency(libs.jsonSimple.get() as String)
+        dependency(libs.keycloakSamlAdapterApiPublic.get() as String)
+        dependency(libs.keycloakSamlServletFilterAdapter.get() as String) {
             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}") {
+        dependency(libs.keycloakAdapterCore.get() as String) {
             exclude "org.bouncycastle:bcprov-jdk15on"
         }
-        dependency("org.keycloak:keycloak-servlet-filter-adapter:${Deps.keycloakVersion}") {
+        dependency(libs.keycloakServletFilterAdapter.get() as String) {
             exclude "org.bouncycastle:bcprov-jdk15on"
         }
-        dependency "org.apache.santuario:xmlsec:${Deps.xmlsecVersion}"
-        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}"
+        dependency(libs.xmlsec.get() as String)
+        dependency(libs.bouncyCastleBcprov.get() as String)
+        dependency(libs.bouncyCastleBcpkix.get() as String)
+        dependency(libs.bouncyCastleBcutil.get() as String)
+        dependency(libs.spnego.get() as String)
     }
 }
 publishing {

diff --git a/bonita-integration-tests/benchmarks/build.gradle b/bonita-integration-tests/benchmarks/build.gradle
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-    api "org.assertj:assertj-core:${Deps.assertjVersion}"
-    api "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    api libs.assertj
+    api libs.mockitoCore
     api project(':bonita-integration-tests:bonita-integration-tests-client')
     api project(':bpm:bonita-server')
     testRuntimeOnly libs.logback

diff --git a/bonita-integration-tests/bonita-integration-tests-client/build.gradle b/bonita-integration-tests/bonita-integration-tests-client/build.gradle
@@ -9,16 +9,16 @@ dependencies {
     api project(':bpm:bonita-common')
     api project(':bpm:bonita-client')
     api project(':bonita-integration-tests:bonita-test-utils')
-    api "org.assertj:assertj-core:${Deps.assertjVersion}"
-    api "net.javacrumbs.json-unit:json-unit-fluent:${Deps.jsonUnitVersion}"
-    api "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
-    api "net.jodah:concurrentunit:${Deps.concurrentUnitVersion}"
+    api libs.assertj
+    api libs.jsonUnitFluent
+    api libs.systemRules
+    api libs.concurrentUnit
     runtimeOnly libs.logback
     testImplementation project(':bpm:bonita-server')
     testImplementation testFixtures(project(':bpm:bonita-common'))
-    testImplementation "org.awaitility:awaitility:${Deps.awaitilityVersion}"
-    testImplementation "xmlunit:xmlunit:${Deps.xmlunitVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    testImplementation libs.awaitility
+    testImplementation libs.xmlunit
+    testImplementation libs.mockitoCore
 }
 
 test.doFirst {

diff --git a/bonita-integration-tests/bonita-integration-tests-local/build.gradle b/bonita-integration-tests/bonita-integration-tests-local/build.gradle
@@ -3,17 +3,17 @@ plugins {
     id("bonita-tests")
 }
 dependencies {
-    api "org.assertj:assertj-core:${Deps.assertjVersion}"
-    api "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    api libs.assertj
+    api libs.mockitoCore
     api project(':bonita-integration-tests:bonita-integration-tests-client')
     implementation(project(":bpm:bonita-core:bonita-process-engine"))
     api project(':bpm:bonita-server')
     api libs.commonsIO
     testRuntimeOnly libs.logback
     testAnnotationProcessor libs.lombok
     testImplementation libs.lombok
-    testImplementation "org.awaitility:awaitility:${Deps.awaitilityVersion}"
-    testImplementation "com.github.stefanbirkner:system-lambda:${Deps.systemLambdaVersion}"
+    testImplementation libs.awaitility
+    testImplementation libs.systemLambda
 }
 
 tasks.register("testsJar", Jar) {

diff --git a/bonita-integration-tests/bonita-integration-tests-web/build.gradle b/bonita-integration-tests/bonita-integration-tests-web/build.gradle
@@ -14,10 +14,10 @@ dependencies {
     implementation libs.jakartaServletApi
     implementation libs.junit4
     implementation libs.springTest
-    testImplementation "org.hamcrest:hamcrest:${Deps.hamcrestVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "org.restlet.jse:org.restlet:${Deps.restletVersion}"
+    testImplementation libs.hamcrest
+    testImplementation libs.mockitoCore
+    testImplementation libs.assertj
+    testImplementation libs.restlet
 }
 
 java {

diff --git a/bonita-integration-tests/bonita-query-tests/build.gradle b/bonita-integration-tests/bonita-query-tests/build.gradle
@@ -3,14 +3,14 @@ plugins { id 'bonita-docker-database' }
 dependencies {
     testAnnotationProcessor libs.lombok
     testImplementation libs.lombok
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
+    testImplementation libs.assertj
     testImplementation libs.h2
     testImplementation libs.springBeans
     testImplementation libs.springTx
     testImplementation libs.springTest
     testImplementation libs.springJdbc
-    testImplementation "org.springframework:spring-orm:4.3.16.RELEASE"
-    testImplementation "jakarta.inject:jakarta.inject-api:1.0.5"
+    testImplementation libs.springOrm
+    testImplementation libs.jakartaInjectApi
     testImplementation project(":bpm:bonita-server")
     testImplementation project(":bpm:bonita-common")
 

diff --git a/bonita-integration-tests/bonita-test-utils/build.gradle b/bonita-integration-tests/bonita-test-utils/build.gradle
@@ -3,8 +3,8 @@ dependencies {
     api project(':bpm:bonita-common')
     api project(':bonita-test-api')
     api libs.commonsIO
-    api "xmlunit:xmlunit:${Deps.xmlunitVersion}"
-    api "org.assertj:assertj-core:${Deps.assertjVersion}"
+    api libs.xmlunit
+    api libs.assertj
 
     implementation project(':bpm:bonita-core:bonita-process-engine')
     implementation libs.junit4

diff --git a/bonita-test-api/build.gradle b/bonita-test-api/build.gradle
@@ -7,16 +7,16 @@ dependencies {
     implementation libs.springTest
 
     // for http tests:
-    compileOnly("org.eclipse.jetty:jetty-server:${Deps.jettyVersion}")
-    compileOnly("org.eclipse.jetty:jetty-servlet:${Deps.jettyVersion}")
+    compileOnly(libs.jettyServer)
+    compileOnly(libs.jettyServlet)
     compileOnly(project(':bpm:bonita-api:bonita-server-api-http'))
 
     annotationProcessor libs.lombok
     compileOnly libs.lombok
 
     testImplementation project(':bpm:bonita-server')
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
+    testImplementation libs.mockitoCore
+    testImplementation libs.assertj
 }
 
 publishing {

diff --git a/bpm/bonita-api/bonita-server-api-http/build.gradle b/bpm/bonita-api/bonita-server-api-http/build.gradle
@@ -8,10 +8,10 @@ dependencies {
     api libs.commonsFileUpload
     api libs.commonsIO
     testImplementation libs.springTest
-    testImplementation "org.mockito:mockito-junit-jupiter:${Deps.mockitoVersion}"
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
+    testImplementation libs.mockitoJunitJupiter
+    testImplementation libs.assertj
+    testImplementation libs.mockitoCore
+    testImplementation libs.systemRules
     testRuntimeOnly libs.springWebMvc
     compileOnly libs.jakartaServletApi
     testImplementation libs.jakartaServletApi

diff --git a/bpm/bonita-client/build.gradle b/bpm/bonita-client/build.gradle
@@ -10,13 +10,11 @@ dependencies {
     api libs.httpComponentsClient
     api libs.xstream
     api libs.httpComponentsMime
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
+    testImplementation libs.assertj
     testImplementation libs.logback
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation 'org.eclipse.jetty:jetty-server:8.1.14.v20131031'
-    testImplementation 'org.eclipse.jetty:jetty-jndi:8.1.14.v20131031'
-    testImplementation 'org.eclipse.jetty:jetty-webapp:8.1.14.v20131031'
-    testImplementation 'org.eclipse.jetty:jetty-plus:8.1.14.v20131031'
+    testImplementation libs.mockitoCore
+    testImplementation libs.jettyServer
+    testImplementation libs.jettySecurity
 }
 
 tasks.register("testsJar", Jar) {

diff --git a/bpm/bonita-client/src/test/java/org/bonitasoft/engine/api/HTTPServerAPIIT.java b/bpm/bonita-client/src/test/java/org/bonitasoft/engine/api/HTTPServerAPIIT.java
@@ -18,7 +18,11 @@
 
 import java.io.Serializable;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -31,6 +35,7 @@
 import org.eclipse.jetty.security.authentication.BasicAuthenticator;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.util.security.Constraint;
 import org.junit.AfterClass;
@@ -86,7 +91,6 @@ public static void startJetty() throws Exception {
         security.setConstraintMappings(Collections.singletonList(mapping));
         security.setAuthenticator(new BasicAuthenticator());
         security.setLoginService(loginService);
-        security.setStrict(false);
 
         // Simulate Bonita engine part
         BonitaHandler bonitaHandler = new BonitaHandler();
@@ -96,7 +100,7 @@ public static void startJetty() throws Exception {
         server.start();
 
         // retrieve port
-        int actualPort = server.getConnectors()[0].getLocalPort();
+        int actualPort = ((ServerConnector) server.getConnectors()[0]).getLocalPort();
         baseResourceUrl = "http://localhost:" + actualPort;
     }
 

diff --git a/bpm/bonita-common/build.gradle b/bpm/bonita-common/build.gradle
@@ -22,16 +22,16 @@ dependencies {
     annotationProcessor libs.lombok
 
     testImplementation project(':bpm:bonita-sap-jco-connector-api')
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    testImplementation libs.assertj
+    testImplementation libs.mockitoCore
     testImplementation libs.logback
-    testImplementation 'org.jmockit:jmockit:1.44'
-    testImplementation "net.javacrumbs.json-unit:json-unit-fluent:${Deps.jsonUnitVersion}"
+    testImplementation libs.jmockit
+    testImplementation libs.jsonUnitFluent
 
     testFixturesApi("org.bonitasoft.engine:bonita-business-object-model") {
         artifact { classifier = 'tests' }
     }
-    testFixturesImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
+    testFixturesImplementation libs.assertj
 }
 
 tasks.register("testsJar", Jar) {

diff --git a/bpm/bonita-core/bonita-actor-mapping/build.gradle b/bpm/bonita-core/bonita-actor-mapping/build.gradle
@@ -7,8 +7,8 @@ dependencies {
     api project(':services:bonita-events')
     api project(':services:bonita-log')
     api project(':services:bonita-persistence')
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
+    testImplementation libs.mockitoCore
+    testImplementation libs.assertj
 
     annotationProcessor libs.lombok
     compileOnly libs.lombok

diff --git a/bpm/bonita-core/bonita-category/build.gradle b/bpm/bonita-core/bonita-category/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':services:bonita-events')
     api project(':services:bonita-log')
     api project(':services:bonita-persistence')
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    testImplementation libs.mockitoCore
 
     annotationProcessor libs.lombok
     compileOnly libs.lombok

diff --git a/bpm/bonita-core/bonita-contract-data/build.gradle b/bpm/bonita-core/bonita-contract-data/build.gradle
@@ -6,10 +6,13 @@ dependencies {
     api project(':services:bonita-log')
     api project(':services:bonita-archive')
     api project(':services:bonita-persistence')
+
     implementation platform(libs.bonitaArtifactsModelBom)
     implementation 'org.bonitasoft.engine:bonita-process-definition-model'
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
+
+    testImplementation libs.assertj
+    testImplementation libs.mockitoCore
+
     annotationProcessor libs.lombok
     compileOnly libs.lombok
 }
diff --git a/bpm/bonita-core/bonita-core-data/build.gradle b/bpm/bonita-core/bonita-core-data/build.gradle
@@ -6,6 +6,6 @@ dependencies {
     api libs.commonsLang
     api project(':services:bonita-cache')
     api project(':services:bonita-persistence')
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    testImplementation libs.assertj
+    testImplementation libs.mockitoCore
 }
diff --git a/bpm/bonita-core/bonita-form-mapping/build.gradle b/bpm/bonita-core/bonita-form-mapping/build.gradle
@@ -10,8 +10,8 @@ dependencies {
     api project(':services:bonita-commons')
     api project(':services:bonita-events')
     api libs.hibernateCore
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    testImplementation libs.assertj
+    testImplementation libs.mockitoCore
 
     annotationProcessor libs.lombok
     compileOnly libs.lombok

diff --git a/bpm/bonita-core/bonita-home-server/build.gradle b/bpm/bonita-core/bonita-home-server/build.gradle
@@ -4,8 +4,8 @@ dependencies {
     api project(':bpm:bonita-common')
     api libs.commonsIO
     api project(':platform:platform-resources')
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
+    testImplementation libs.assertj
+    testImplementation libs.mockitoCore
+    testImplementation libs.systemRules
     testRuntimeOnly libs.logback
 }
diff --git a/bpm/bonita-core/bonita-login/build.gradle b/bpm/bonita-core/bonita-login/build.gradle
@@ -6,8 +6,8 @@ dependencies {
     api project(':services:bonita-authentication')
     api project(':services:bonita-profile')
     api project(':services:bonita-authorization')
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
+    testImplementation libs.mockitoCore
+    testImplementation libs.assertj
     testImplementation libs.logback
 
     compileOnly libs.lombok

diff --git a/bpm/bonita-core/bonita-parameter/build.gradle b/bpm/bonita-core/bonita-parameter/build.gradle
@@ -7,9 +7,9 @@ dependencies {
     api project(':services:bonita-cache')
     api project(':services:bonita-builder')
     api project(':services:bonita-persistence')
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
-    testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
+    testImplementation libs.mockitoCore
+    testImplementation libs.assertj
+    testImplementation libs.systemRules
     testRuntimeOnly libs.logback
 
     annotationProcessor libs.lombok

diff --git a/bpm/bonita-core/bonita-platform-login/build.gradle b/bpm/bonita-core/bonita-platform-login/build.gradle
@@ -4,5 +4,5 @@ dependencies {
     api project(':services:bonita-commons')
     api project(':services:bonita-platform-session')
     api project(':services:bonita-platform-authentication')
-    testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
+    testImplementation libs.mockitoCore
 }