chore(gradle): convert some libs to version catalog (#2987)

* chore(dependabot): set weekly update check to Sunday
* chore(version catalog): convert commons-collection
* chore(version catalog): convert tomcat-dbcp
* chore(version catalog): convert commons-cli
* chore(version catalog): convert semver4j
* chore(version catalog): convert slf4j-api
* chore(version catalog): convert hibernate
* chore(version catalog): convert jackson BOM
* chore(version catalog): convert jakarta.transaction-api (which is in fact Javax inside)
* chore(version catalog): convert jakarta.servlet-api
* chore(version catalog): convert javax.servlet-api
* chore(version catalog): clean-up Groovy version refs
* chore(version catalog): convert javassist (used by Hibernate)
* chore(version catalog): convert httpComponents (httpclient, httpmime)

bonita-engine-standalone/build.gradle

@@ -13,8 +13,8 @@ dependencies {
 
     implementation libs.springContext
     implementation "org.jboss.narayana.jta:narayana-jta:${Deps.narayanaVersion}"
-    implementation "org.apache.tomcat:tomcat-dbcp:${Deps.tomcatDbcpVersion}"
-    implementation "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    implementation libs.tomcatDbcp
+    implementation libs.slf4jApi
     runtimeOnly libs.h2
 
 

bonita-engine/build.gradle

@@ -7,11 +7,11 @@ plugins {
 dependencyManagement {
     dependencies {
         imports {
-            mavenBom "com.fasterxml.jackson:jackson-bom:${Deps.jacksonBomVersion}"
-            mavenBom "org.codehaus.groovy:groovy-bom:${Deps.groovyVersion}"
+            mavenBom libs.jacksonBom.get() as String
+            mavenBom libs.groovyBom.get() as String
             mavenBom libs.bonitaArtifactsModelBom.get() as String
         }
-        dependencySet(group: 'org.slf4j', version: Deps.slf4jVersion) {
+        dependencySet(group: 'org.slf4j', version: libs.versions.slf4jVersion.get()) {
             entry 'slf4j-api'
             entry 'slf4j-jdk14'
         }
@@ -27,28 +27,28 @@ dependencyManagement {
             entry "spring-boot-starter-jdbc"
             entry "spring-boot-autoconfigure"
         }
-        dependency("org.hibernate:hibernate-core:${Deps.hibernateVersion}") {
+        dependency(libs.hibernateCore.get() as String) {
             exclude 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec'
         }
-        dependency "org.hibernate:hibernate-jcache:${Deps.hibernateVersion}"
+        dependency(libs.hibernateJCache.get() as String)
         dependency("javax.cache:cache-api:${Deps.jcacheVersion}")
         dependency "javax.persistence:javax.persistence-api:${Deps.javaxPersistenceApiVersion}"
         dependency libs.commonsIO.get() as String
         dependency libs.commonsFileUpload.get() as String
         dependency(libs.commonsBeanUtils.get() as String) {
             exclude 'commons-collections:commons-collections'
         }
-        dependency("commons-cli:commons-cli:${Deps.commonsCLIVersion}")
+        dependency(libs.commonsCLI.get() as String)
         dependency libs.commonsLang.get() as String
-        dependency "org.apache.commons:commons-collections4:${Deps.commonsCollections4Version}"
-        dependency "jakarta.transaction:jakarta.transaction-api:${Deps.jakartaTransactionVersion}"
-        dependency "org.javassist:javassist:${Deps.javassistVersion}"
-        dependencySet(group: 'org.apache.httpcomponents', version: Deps.httpComponentsVersion) {
+        dependency libs.commonsCollections.get() as String
+        dependency libs.jakartaTransactionApi.get() as String
+        dependency libs.javassist.get() as String
+        dependencySet(group: 'org.apache.httpcomponents', version: libs.versions.httpComponentsVersion.get()) {
             entry 'httpclient'
             entry 'httpmime'
         }
         dependency "com.thoughtworks.xstream:xstream:${Deps.xstreamVersion}"
-        dependency "org.apache.tomcat:tomcat-dbcp:${Deps.tomcatDbcpVersion}"
+        dependency libs.tomcatDbcp.get() as String
         dependency "org.jboss.narayana.jta:narayana-jta:${Deps.narayanaVersion}"
         dependency "com.sun.activation:jakarta.activation:${Deps.activationVersion}"
         dependency libs.snakeyaml.get() as String
@@ -66,10 +66,10 @@ dependencyManagement {
             entry 'hazelcast-spring'
         }
         // declared here because it is used by web-extension and by distrib
-        dependency "jakarta.servlet:jakarta.servlet-api:${Deps.jakartaServletVersion}"
+        dependency(libs.jakartaServletApi.get() as String)
         // To be removed only when client projects (rest api extension) have all moved their deps to jakarta
         // Just keep a version managed to prevent client build breaks
-        dependency "javax.servlet:javax.servlet-api:${Deps.javaxServletVersion}"
+        dependency(libs.javaxServletApi.get() as String)
 
         // Bonita engine dependencies:
         dependency "org.bonitasoft.engine:bonita-common:${project.version}"

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

@@ -9,9 +9,9 @@ repositories {
 dependencies {
     implementation project(':bpm:bonita-web-server')
     implementation project(':bonita-test-api')
-    implementation "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    implementation libs.slf4jApi
     implementation libs.commonsIO
-    implementation "jakarta.servlet:jakarta.servlet-api:${Deps.jakartaServletVersion}"
+    implementation libs.jakartaServletApi
     implementation libs.springTest
     testImplementation "org.hamcrest:hamcrest:${Deps.hamcrestVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"

bpm/bonita-api/bonita-server-api-http/build.gradle

@@ -17,8 +17,8 @@ dependencies {
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
     testRuntimeOnly libs.springWebMvc
-    compileOnly "jakarta.servlet:jakarta.servlet-api:${Deps.jakartaServletVersion}"
-    testImplementation "jakarta.servlet:jakarta.servlet-api:${Deps.jakartaServletVersion}"
+    compileOnly libs.jakartaServletApi
+    testImplementation libs.jakartaServletApi
 }
 
 test {

bpm/bonita-client/build.gradle

@@ -7,9 +7,9 @@ plugins {
 
 dependencies {
     api project(':bpm:bonita-common')
-    api "org.apache.httpcomponents:httpclient:${Deps.httpComponentsVersion}"
+    api libs.httpComponentsClient
     api "com.thoughtworks.xstream:xstream:${Deps.xstreamVersion}"
-    api "org.apache.httpcomponents:httpmime:${Deps.httpComponentsVersion}"
+    api libs.httpComponentsMime
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}"

bpm/bonita-common/build.gradle

@@ -3,7 +3,7 @@ import org.bonitasoft.engine.gradle.PomUtils
 apply plugin: 'java-test-fixtures'
 
 dependencies {
-    api platform("com.fasterxml.jackson:jackson-bom:${Deps.jacksonBomVersion}")
+    api platform(libs.jacksonBom)
     api platform(libs.bonitaArtifactsModelBom)
 
     api "org.bonitasoft.engine:bonita-business-archive"
@@ -12,7 +12,7 @@ dependencies {
     api "org.bonitasoft.engine:bonita-organization-model"
     api "org.bonitasoft.engine:bonita-application-model"
     api "com.fasterxml.jackson.core:jackson-databind"
-    api "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    api libs.slf4jApi
     api "com.fasterxml.jackson.core:jackson-annotations"
 
     runtimeOnly "com.sun.activation:jakarta.activation"

bpm/bonita-core/bonita-form-mapping/build.gradle

@@ -9,7 +9,7 @@ dependencies {
     api project(':services:bonita-persistence')
     api project(':services:bonita-commons')
     api project(':services:bonita-events')
-    api "org.hibernate:hibernate-core:${Deps.hibernateVersion}"
+    api libs.hibernateCore
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"

bpm/bonita-core/bonita-process-engine/build.gradle

@@ -5,7 +5,7 @@ plugins {
 dependencies {
     api platform(libs.bonitaArtifactsModelBom)
 
-    api "com.vdurmont:semver4j:${Deps.semver4jVersion}"
+    api libs.semver4j
     api "org.bonitasoft.engine:bonita-organization-model"
     api project(':bpm:bonita-core:bonita-home-server')
     api project(':bpm:bonita-core:bonita-actor-mapping')

bpm/bonita-server/build.gradle

@@ -7,7 +7,7 @@ dependencies {
     // When create the shade version of bonita-server, the bonita-common project is excluded causing the jackson bom not to be imported
     // This cause issues to the code deposit because an different version of jackson, that was not downloaded to local cache, can be required during offline build.
     // Remove the shade to solve that issue
-    implementation(platform("com.fasterxml.jackson:jackson-bom:${Deps.jacksonBomVersion}"))
+    implementation(platform(libs.jacksonBom))
     api project(':bpm:bonita-core:bonita-process-engine')
     api project(':services:bonita-builder')
     api project(':bpm:bonita-core:bonita-actor-mapping')

bpm/bonita-web-extensions/build.gradle

@@ -1,7 +1,7 @@
 import org.bonitasoft.engine.gradle.PomUtils
 
 dependencies {
-    api "javax.servlet:javax.servlet-api:${Deps.javaxServletVersion}"
+    api(libs.javaxServletApi)
     api(project(":bpm:bonita-client"))
     api(project(":bpm:bonita-common"))
     testImplementation "junit:junit:${Deps.junit4Version}"

bpm/bonita-web-server/build.gradle

@@ -11,11 +11,11 @@ dependencies {
     implementation(project(":bpm:bonita-common"))
     implementation(project(":bpm:bonita-web-extensions"))
     implementation libs.commonsIO
-    implementation "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    implementation libs.slf4jApi
     implementation "net.sf.ehcache:ehcache:${Deps.ehcacheVersion}"
     implementation libs.commonsFileUpload
     implementation libs.commonsBeanUtils
-    implementation "org.apache.commons:commons-collections4:${Deps.commonsCollections4Version}"
+    implementation libs.commonsCollections
     implementation libs.commonsLang
     implementation "com.googlecode.json-simple:json-simple:${Deps.jsonSimpleVersion}"
     implementation "org.tuckey:urlrewritefilter:${Deps.urlrewriteVersion}"

buildSrc/src/main/groovy/Deps.groovy

@@ -1,23 +1,5 @@
 class Deps {
 
-    public static String commonsCollections4Version = "4.4"
-    public static String tomcatDbcpVersion = "9.0.83"
-    public static String commonsCLIVersion = "1.4"
-    public static String semver4jVersion = '3.1.0'
-    public static String slf4jVersion = "1.7.36"
-
-    // Attention, see PassingPropertiesJCacheRegionFactory javadoc if this version changes:
-    public static String hibernateVersion = "5.4.32.Final"
-
-    public static String jacksonBomVersion = "2.15.3"
-    public static String jakartaTransactionVersion = "1.3.3"
-    public static String jakartaServletVersion = "4.0.4"
-    // Keep this until all client projects have migrated to jakarta or it will break their builds !
-    public static String javaxServletVersion = "4.0.1"
-    // The groovy version must be in synch with the runtime-bom artifact
-    public static String groovyVersion = "3.0.19"
-    public static String javassistVersion = "3.27.0-GA" //version used by hibernate 5.4.32.Final
-    public static String httpComponentsVersion = "4.5.13"
     public static String xstreamVersion = "1.4.20"
     public static String ehcacheVersion = "2.10.10.12.7"
     public static String eclipseCompilerVersion = "3.20.0"

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-# The groovy version must be in synch with the runtime-bom artifact:
+# The groovy version must be in synch with the bonita-project-parent POM (bonita-project repository):
 groovyVersion = "3.0.19"
 springVersion = "5.3.34"
 springSessionVersion = "2.7.4"
@@ -10,6 +10,21 @@ bonitaArtifactsModelVersion = "1.0.0"
 commonsIOVersion = "2.8.0"
 commonsFileUploadVersion = "1.5"
 commonsBeanutilsVersion = "1.9.4"
+commonsCollectionsVersion = "4.4"
+tomcatDbcpVersion = "9.0.83"
+commonsCLIVersion = "1.4"
+semver4jVersion = '3.1.0'
+slf4jVersion = "1.7.36"
+# Attention, see PassingPropertiesJCacheRegionFactory javadoc if this version changes:
+hibernateVersion = "5.4.32.Final"
+# version used by hibernate 5.4.32.Final (MUST BE REMOVED WHEN HIBERNATE IS UPGRADED to 5.6+):
+javassistVersion = "3.27.0-GA"
+jacksonBomVersion = "2.15.3"
+jakartaTransactionVersion = "1.3.3"
+jakartaServletVersion = "4.0.4"
+# Keep this until all client projects have migrated to jakarta or it will break their builds !
+javaxServletVersion = "4.0.1"
+httpComponentsVersion = "4.5.13"
 
 [libraries]
 springCore = { module = "org.springframework:spring-core", version.ref = "springVersion" }
@@ -29,6 +44,7 @@ springBootStarter = { module = "org.springframework.boot:spring-boot-starter", v
 springBootStarterJdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springBootVersion" }
 springBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springBootVersion" }
 
+groovyBom = { module = "org.codehaus.groovy:groovy-bom", version.ref = "groovyVersion" }
 groovyCore = { module = "org.codehaus.groovy:groovy", version.ref = "groovyVersion" }
 groovyServlet = { module = "org.codehaus.groovy:groovy-servlet", version.ref = "groovyVersion" }
 groovyXml = { module = "org.codehaus.groovy:groovy-xml", version.ref = "groovyVersion" }
@@ -63,6 +79,24 @@ snakeyaml = "org.yaml:snakeyaml:1.32"
 commonsIO = { group = "commons-io", name = "commons-io", version.ref = "commonsIOVersion" }
 commonsFileUpload = { group = "commons-fileupload", name = "commons-fileupload", version.ref = "commonsFileUploadVersion" }
 commonsBeanUtils = { group = "commons-beanutils", name = "commons-beanutils", version.ref = "commonsBeanutilsVersion" }
+commonsCollections = { group = "org.apache.commons", name = "commons-collections4", version.ref = "commonsCollectionsVersion" }
+tomcatDbcp = { group = "org.apache.tomcat", name = "tomcat-dbcp", version.ref = "tomcatDbcpVersion" }
+commonsCLI = { group = "commons-cli", name = "commons-cli", version.ref = "commonsCLIVersion" }
+semver4j = { group = "com.vdurmont", name = "semver4j", version.ref = "semver4jVersion" }
+slf4jApi = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4jVersion" }
+
+hibernateCore = { group = "org.hibernate", name = "hibernate-core", version.ref = "hibernateVersion" }
+hibernateJCache = { group = "org.hibernate", name = "hibernate-jcache", version.ref = "hibernateVersion" }
+javassist = { group = "org.javassist", name = "javassist", version.ref = "javassistVersion" }
+
+jacksonBom = { group = "com.fasterxml.jackson", name = "jackson-bom", version.ref = "jacksonBomVersion" }
+
+jakartaTransactionApi = { group = "jakarta.transaction", name = "jakarta.transaction-api", version.ref = "jakartaTransactionVersion" }
+jakartaServletApi = { group = "jakarta.servlet", name = "jakarta.servlet-api", version.ref = "jakartaServletVersion" }
+javaxServletApi = { group = "javax.servlet", name = "javax.servlet-api", version.ref = "javaxServletVersion" }
+
+httpComponentsClient = { group = "org.apache.httpcomponents", name = "httpclient", version.ref = "httpComponentsVersion" }
+httpComponentsMime = { group = "org.apache.httpcomponents", name = "httpmime", version.ref = "httpComponentsVersion" }
 
 h2 = "com.h2database:h2:1.4.199"
 

platform/platform-resources/build.gradle

@@ -13,7 +13,7 @@ dependencies {
     api libs.springTx
     api libs.springJdbc
     api libs.springContext
-    api "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    api libs.slf4jApi
     api libs.commonsIO
 
     testImplementation "junit:junit:${Deps.junit4Version}"

platform/platform-setup/build.gradle

@@ -13,7 +13,7 @@ configurations {
 
 dependencies {
     api "org.apache.commons:commons-text:1.10.0"
-    api "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    api libs.slf4jApi
     api(libs.springBootStarter) {
         exclude(module: 'jul-to-slf4j')
         exclude(module: 'log4j-to-slf4j')
@@ -35,7 +35,7 @@ dependencies {
         exclude(module: "ucp")
         exclude(module: "simplefan")
     }
-    api "commons-cli:commons-cli:${Deps.commonsCLIVersion}"
+    api libs.commonsCLI
     annotationProcessor libs.lombok
     compileOnly libs.lombok
     api(project(":platform:platform-resources"))

services/bonita-business-data/bonita-business-data-api/build.gradle

@@ -2,7 +2,7 @@
 
 dependencies {
     api project(':services:bonita-commons')
-    api "org.javassist:javassist:${Deps.javassistVersion}"
+    api libs.javassist
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"

services/bonita-business-data/bonita-business-data-client-resources/build.gradle

@@ -6,13 +6,13 @@ plugins {
 
 dependencies {
     api project(':bpm:bonita-common')
-    api "org.javassist:javassist:${Deps.javassistVersion}"
+    api libs.javassist
     compileOnly project(':bpm:bonita-client')
     testImplementation project(':bpm:bonita-client')
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    testImplementation("org.hibernate:hibernate-core:${Deps.hibernateVersion}") {
+    testImplementation(libs.hibernateCore) {
         exclude(module: 'jboss-transaction-api_1.2_spec')
     }
     testImplementation libs.lombok

services/bonita-business-data/bonita-business-data-generator/build.gradle

@@ -7,10 +7,10 @@ plugins {
 
 dependencies {
     api project(':services:bonita-commons')
-    api "org.hibernate:hibernate-core:${Deps.hibernateVersion}"
+    api libs.hibernateCore
     api "org.eclipse.jdt:ecj:${Deps.eclipseCompilerVersion}"
     api libs.springCore
-    api "org.javassist:javassist:${Deps.javassistVersion}"
+    api libs.javassist
     api project(':bpm:bonita-common')
     api libs.commonsLang
     api "org.glassfish.jaxb:codemodel:${Deps.jaxbVersion}"

services/bonita-business-data/bonita-business-data-impl/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     api project(':services:bonita-resources')
     api project(':services:bonita-transaction')
     api project(':services:bonita-commons')
-    api(group: 'org.hibernate', name: 'hibernate-core', version: Deps.hibernateVersion) {
+    api(libs.hibernateCore) {
         exclude(module: 'jboss-transaction-api_1.2_spec')
     }
     api libs.commonsLang
@@ -25,7 +25,7 @@ dependencies {
     testImplementation libs.springTest
     testImplementation libs.springJdbc
     testImplementation testFixtures(project(':bpm:bonita-common'))
-    testRuntimeOnly "org.apache.tomcat:tomcat-dbcp:${Deps.tomcatDbcpVersion}"
+    testRuntimeOnly libs.tomcatDbcp
     testRuntimeOnly libs.h2
     testRuntimeOnly "com.mysql:mysql-connector-j:${Deps.mysqlVersion}"
     testRuntimeOnly "org.postgresql:postgresql:${Deps.postgresqlVersion}"

services/bonita-commons/build.gradle

@@ -11,7 +11,7 @@ dependencies {
     api "io.micrometer:micrometer-core:${Deps.micrometerVersion}"
     api libs.springContext
     api libs.springBootAutoconfigure
-    api "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    api libs.slf4jApi
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.junit.jupiter:junit-jupiter-api:${Deps.junit5Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"

services/bonita-persistence/build.gradle

@@ -5,20 +5,20 @@ plugins {
 dependencies {
     api libs.commonsLang
     api project(':services:bonita-events')
-    api(group: 'org.hibernate', name: 'hibernate-core', version: Deps.hibernateVersion) {
+    api(libs.hibernateCore) {
         exclude(module: "jboss-transaction-api_1.2_spec")
         exclude(group: "javax.activation") //replaced by jakarta
     }
     api "com.sun.activation:jakarta.activation:${Deps.activationVersion}"
     api project(':services:bonita-session')
     api project(':services:bonita-commons')
     api project(':services:bonita-lock')
-    api "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
+    api libs.slf4jApi
     implementation("javax.annotation:javax.annotation-api:${Deps.javaxAnnotationsVersion}")
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
-    compileOnly "jakarta.transaction:jakarta.transaction-api:${Deps.jakartaTransactionVersion}"
+    compileOnly libs.jakartaTransactionApi
 
     annotationProcessor libs.lombok
     compileOnly libs.lombok

services/bonita-time-tracker/build.gradle

@@ -2,7 +2,7 @@
 
 dependencies {
     api project(':services:bonita-commons')
-    api "org.apache.commons:commons-collections4:${Deps.commonsCollections4Version}"
+    api libs.commonsCollections
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"

services/bonita-transaction/build.gradle

@@ -1,6 +1,6 @@
 dependencies {
     api project(':services:bonita-commons')
-    api "jakarta.transaction:jakarta.transaction-api:${Deps.jakartaTransactionVersion}"
+    api libs.jakartaTransactionApi
 
     annotationProcessor libs.lombok
     compileOnly libs.lombok