Merge branch 'master' into merge/10.1.x

bonita-engine-spring-boot-starter/build.gradle

@@ -12,15 +12,13 @@ dependencies {
     api(libs.springBootStarter) {
         exclude(module: 'snakeyaml')
     }
-    api(libs.snakeyaml)
 
     implementation(project(":bonita-engine-standalone"))
     implementation(project(":bpm:bonita-server"))
 
     annotationProcessor(libs.springBootConfigurationProcessor)
 
     testImplementation(libs.springBootTest)
-    testImplementation(libs.junit4)
     testImplementation(libs.assertj)
 }
 

bonita-engine-standalone/build.gradle

@@ -22,11 +22,12 @@ dependencies {
     compileOnly libs.lombok
 
     testImplementation libs.assertj
-    testImplementation libs.junit4
     testImplementation libs.systemRules
-    testImplementation libs.postgresql
-    testImplementation libs.mysql
-    testImplementation libs.h2
+
+    // These 3 drivers are used for some specific tests:
+    testImplementation(libs.postgresql)
+    testImplementation(libs.mysql)
+    testImplementation(libs.h2)
 
 }
 

bonita-engine-standalone/src/main/java/org/bonitasoft/engine/BonitaEngine.java

@@ -53,8 +53,8 @@ public class BonitaEngine {
     private BasicDataSource notManagedBizDataSource;
     private javax.transaction.UserTransaction userTransaction;
     private javax.transaction.TransactionManager arjunaTransactionManager;
-    public static final String BONITA_BDM_DB_VENDOR = "sysprop.bonita.bdm.db.vendor";
-    public static final String BONITA_DB_VENDOR = "sysprop.bonita.db.vendor";
+    public static final String BONITA_BDM_DB_VENDOR = PlatformSetup.BONITA_BDM_DB_VENDOR_PROPERTY;
+    public static final String BONITA_DB_VENDOR = PlatformSetup.BONITA_DB_VENDOR_PROPERTY;
 
     public void initializeEnvironment() throws Exception {
         if (!initialized) {
@@ -115,7 +115,7 @@ private void initializeJNDI() throws NamingException {
 
     public void start() throws Exception {
         initializeEnvironment();
-        PlatformSetup platformSetup = PlatformSetupAccessor.getPlatformSetup();
+        PlatformSetup platformSetup = getPlatformSetup();
         platformSetup.init();
 
         PlatformSession platformSession = loginOnPlatform();
@@ -126,6 +126,10 @@ public void start() throws Exception {
         logoutFromPlatform(platformSession);
     }
 
+    protected PlatformSetup getPlatformSetup() throws NamingException {
+        return PlatformSetupAccessor.getInstance().getPlatformSetup();
+    }
+
     private void logoutFromPlatform(PlatformSession platformSession)
             throws PlatformLogoutException, SessionNotFoundException, BonitaHomeNotSetException, ServerAPIException,
             UnknownAPITypeException {

bonita-engine/build.gradle

@@ -32,7 +32,7 @@ dependencyManagement {
         }
         dependency(libs.hibernateJCache.get() as String)
         dependency(libs.jcache.get() as String)
-        dependency libs.javaxPersistenceApi.get() as String
+        dependency(libs.javaxPersistenceApi.get() as String)
         dependency libs.commonsIO.get() as String
         dependency libs.commonsFileUpload.get() as String
         dependency(libs.commonsBeanUtils.get() as String) {
@@ -51,19 +51,14 @@ dependencyManagement {
         dependency libs.tomcatDbcp.get() as String
         dependency libs.narayanaJta.get() as String
         dependency libs.jakartaActivation.get() as String
-        dependency libs.snakeyaml.get() as String
         dependency(libs.quartz.get() as String)
         dependency(libs.eclipseCompiler.get() as String)
         dependency(libs.javaxAnnotations.get() as String)
-        dependencySet(group: "io.micrometer", version: libs.versions.micrometerVersion.get()) {
-            entry "micrometer-core"
-            entry "micrometer-registry-jmx"
-            entry "micrometer-registry-prometheus"
-        }
-        dependencySet(group: 'com.hazelcast', version: libs.versions.hazelcastVersion.get()) {
-            entry 'hazelcast'
-            entry 'hazelcast-spring'
-        }
+        dependency(libs.micrometerCore.get() as String)
+        dependency(libs.micrometerRegistryJmx.get() as String)
+        dependency(libs.micrometerRegistryPrometheus.get() as String)
+        dependency(libs.hazelcast.get() as String)
+        dependency(libs.hazelcastSpring.get() as String)
         // declared here because it is used by web-extension and by distrib
         dependency(libs.jakartaServletApi.get() as String)
         // To be removed only when client projects (rest api extension) have all moved their deps to jakarta

bonita-integration-tests/benchmarks/build.gradle

@@ -3,14 +3,10 @@ plugins {
 }
 
 dependencies {
-    api libs.junit4
     api libs.assertj
     api libs.mockitoCore
     api project(':bonita-integration-tests:bonita-integration-tests-client')
     api project(':bpm:bonita-server')
-    runtimeOnly libs.mysql
-    runtimeOnly libs.msSqlServer
-    runtimeOnly libs.postgresql
     testRuntimeOnly libs.logback
 }
 

bonita-integration-tests/bonita-integration-tests-client/build.gradle

@@ -5,7 +5,6 @@ plugins {
 }
 dependencies {
     api project(':bonita-test-api')
-    api libs.junit4
     api libs.commonsIO
     api project(':bpm:bonita-common')
     api project(':bpm:bonita-client')

bonita-integration-tests/bonita-integration-tests-client/src/main/java/org/bonitasoft/engine/CommonAPIIT.java

@@ -60,10 +60,6 @@ public void clean() throws Exception {
         }
     };
 
-    /**
-     * @return warning list of unclean elements
-     * @throws BonitaException
-     */
     private void clean() throws BonitaException {
         loginOnDefaultTenantWithDefaultTechnicalUser();
         cleanCommands();

bonita-integration-tests/bonita-integration-tests-client/src/main/java/org/bonitasoft/engine/business/application/TestWithLivingApplication.java

@@ -54,12 +54,10 @@ public void setUp() throws Exception {
 
     @After
     public void tearDown() throws Exception {
-        final SearchResult<Application> searchResult = getLivingApplicationAPI()
-                .searchApplications(new SearchOptionsBuilder(0, 1000).done());
-        for (final Application app : searchResult.getResult()) {
-            if (app.isEditable()) {
-                getLivingApplicationAPI().deleteApplication(app.getId());
-            }
+        final SearchResult<IApplication> searchResult = getLivingApplicationAPI()
+                .searchIApplications(new SearchOptionsBuilder(0, 1000).done());
+        for (final IApplication app : searchResult.getResult()) {
+            getLivingApplicationAPI().deleteApplication(app.getId());
         }
         logoutThenlogin();
         deleteUser(user);

bonita-integration-tests/bonita-integration-tests-client/src/main/java/org/bonitasoft/engine/business/data/ClassloaderRefresher.java

@@ -15,7 +15,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.ArrayList;
@@ -42,9 +41,9 @@ public class ClassloaderRefresher {
      */
     public ClassLoader loadClientModelInClassloader(final byte[] clientZipContent, final ClassLoader contextClassLoader,
             final String modelClass,
-            final File fsFolderToPutJars) throws IOException, MalformedURLException {
+            final File fsFolderToPutJars) throws IOException {
         final Map<String, byte[]> ressources = IOUtils.unzip(clientZipContent);
-        final List<URL> urls = new ArrayList<URL>();
+        final List<URL> urls = new ArrayList<>();
         for (final Entry<String, byte[]> e : ressources.entrySet()) {
             final File file = new File(fsFolderToPutJars, e.getKey());
             if (file.getName().endsWith(".jar")) {
@@ -58,7 +57,7 @@ public ClassLoader loadClientModelInClassloader(final byte[] clientZipContent, f
                 }
                 if (file.getName().contains("dao")) {
                     try {
-                        contextClassLoader.loadClass(modelClass + "DAO");
+                        contextClassLoader.loadClass(modelClass + "DAOImpl");
                     } catch (final ClassNotFoundException e1) {
                         FileUtils.writeByteArrayToFile(file, e.getValue());
                         urls.add(file.toURI().toURL());
@@ -76,7 +75,7 @@ public ClassLoader loadClientModelInClassloader(final byte[] clientZipContent, f
         }
         ClassLoader classLoaderWithBDM = contextClassLoader;
         if (!urls.isEmpty()) {
-            classLoaderWithBDM = new URLClassLoader(urls.toArray(new URL[urls.size()]), contextClassLoader);
+            classLoaderWithBDM = new URLClassLoader(urls.toArray(new URL[0]), contextClassLoader);
         }
         return classLoaderWithBDM;
     }