chore(version): move some deps to version catalog (#2948)

* chore(plugins): declare plugins in Version Catalog * chore(deps): declare bonita-artifacts-model in Version Catalog * chore(deps): move spring deps to Version Catalog * chore(version catalog): convert commons-io * chore(version catalog): remove unused commons-codec * chore(dependabot): restore gradle updates to weekly freq. * chore(version catalog): convert commons-fileupload * chore(version catalog): convert commons-beanutils * chore(dependabot): set it on monday to test it Co-authored-by: Emmanuel Duchastenier <[email protected]>
bonitasoft · Apr 8, 2024 · afb7568 · afb7568
1 parent 6a1e113
commit afb7568
Show file tree

Hide file tree

Showing 30 changed files with 123 additions and 105 deletions.
diff --git a/bonita-engine-spring-boot-starter/build.gradle b/bonita-engine-spring-boot-starter/build.gradle
@@ -9,17 +9,17 @@ dependencies {
     api(project(":bpm:bonita-common"))
     api(project(":bpm:bonita-client"))
 
-    api("org.springframework.boot:spring-boot-starter:${Deps.springBootVersion}") {
+    api(libs.springBootStarter) {
         exclude(module: 'snakeyaml')
     }
     api(libs.snakeyaml)
 
     implementation(project(":bonita-engine-standalone"))
     implementation(project(":bpm:bonita-server"))
 
-    annotationProcessor("org.springframework.boot:spring-boot-configuration-processor:${Deps.springBootVersion}")
+    annotationProcessor(libs.springBootConfigurationProcessor)
 
-    testImplementation("org.springframework.boot:spring-boot-test:${Deps.springBootVersion}")
+    testImplementation(libs.springBootTest)
     testImplementation("junit:junit:${Deps.junit4Version}")
     testImplementation("org.assertj:assertj-core:${Deps.assertjVersion}")
 }

diff --git a/bonita-engine-standalone/build.gradle b/bonita-engine-standalone/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     implementation(project(":bpm:bonita-server"))
     implementation(project(':platform:platform-resources'))
 
-    implementation "org.springframework:spring-context:${Deps.springVersion}"
+    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}"

diff --git a/bonita-engine/build.gradle b/bonita-engine/build.gradle
@@ -9,7 +9,7 @@ dependencyManagement {
         imports {
             mavenBom "com.fasterxml.jackson:jackson-bom:${Deps.jacksonBomVersion}"
             mavenBom "org.codehaus.groovy:groovy-bom:${Deps.groovyVersion}"
-            mavenBom "org.bonitasoft.engine:bonita-artifacts-model-dependencies:${Deps.bonitaArtifactsModelVersion}"
+            mavenBom libs.bonitaArtifactsModelBom.get() as String
         }
         dependencySet(group: 'org.slf4j', version: Deps.slf4jVersion) {
             entry 'slf4j-api'
@@ -18,12 +18,12 @@ dependencyManagement {
         dependency libs.h2.get() as String
         dependency "net.sf.ehcache:ehcache:${Deps.ehcacheVersion}"
 
-        dependencySet(group: 'org.springframework', version: Deps.springVersion) {
+        dependencySet(group: 'org.springframework', version: libs.versions.springVersion.get()) {
             entry 'spring-context'
             entry 'spring-core'
             entry 'spring-web'
         }
-        dependencySet(group: "org.springframework.boot", version: Deps.springBootVersion) {
+        dependencySet(group: "org.springframework.boot", version: libs.versions.springBootVersion.get()) {
             entry "spring-boot-starter-jdbc"
             entry "spring-boot-autoconfigure"
         }
@@ -33,13 +33,12 @@ dependencyManagement {
         dependency "org.hibernate:hibernate-jcache:${Deps.hibernateVersion}"
         dependency("javax.cache:cache-api:${Deps.jcacheVersion}")
         dependency "javax.persistence:javax.persistence-api:${Deps.javaxPersistenceApiVersion}"
-        dependency "commons-io:commons-io:${Deps.commonsIOVersion}"
-        dependency "commons-fileupload:commons-fileupload:${Deps.commonsFileupload}"
-        dependency("commons-beanutils:commons-beanutils:${Deps.commonsBeanutilsVersion}") {
+        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 "commons-codec:commons-codec:${Deps.commonscodec}"
         dependency libs.commonsLang.get() as String
         dependency "org.apache.commons:commons-collections4:${Deps.commonsCollections4Version}"
         dependency "jakarta.transaction:jakarta.transaction-api:${Deps.jakartaTransactionVersion}"

diff --git a/bonita-integration-tests/bonita-integration-tests-client/build.gradle b/bonita-integration-tests/bonita-integration-tests-client/build.gradle
@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api project(':bonita-test-api')
     api "junit:junit:${Deps.junit4Version}"
-    api "commons-io:commons-io:${Deps.commonsIOVersion}"
+    api libs.commonsIO
     api project(':bpm:bonita-common')
     api project(':bpm:bonita-client')
     api project(':bonita-integration-tests:bonita-test-utils')

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

diff --git a/bonita-integration-tests/bonita-integration-tests-web/build.gradle b/bonita-integration-tests/bonita-integration-tests-web/build.gradle
@@ -10,9 +10,9 @@ dependencies {
     implementation project(':bpm:bonita-web-server')
     implementation project(':bonita-test-api')
     implementation "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
-    implementation "commons-io:commons-io:${Deps.commonsIOVersion}"
+    implementation libs.commonsIO
     implementation "jakarta.servlet:jakarta.servlet-api:${Deps.jakartaServletVersion}"
-    implementation "org.springframework:spring-test:${Deps.springVersion}"
+    implementation libs.springTest
     testImplementation "org.hamcrest:hamcrest:${Deps.hamcrestVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"

diff --git a/bonita-integration-tests/bonita-query-tests/build.gradle b/bonita-integration-tests/bonita-query-tests/build.gradle
@@ -4,13 +4,13 @@ dependencies {
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation libs.h2
-    testImplementation "org.springframework:spring-beans:${Deps.springVersion}"
-    testImplementation "org.springframework:spring-tx:${Deps.springVersion}"
-    testImplementation "org.springframework:spring-test:${Deps.springVersion}"
-    testImplementation 'org.springframework:spring-orm:4.3.16.RELEASE'
-    testImplementation "org.springframework:spring-jdbc:${Deps.springVersion}"
-    testImplementation 'jakarta.inject:jakarta.inject-api:1.0.5'
-    testImplementation project(':bpm:bonita-server')
-    testImplementation project(':bpm:bonita-common')
+    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 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,7 +3,7 @@ dependencies {
     api project(':bpm:bonita-common')
     api project(':bonita-test-api')
     api "junit:junit:${Deps.junit4Version}"
-    api "commons-io:commons-io:${Deps.commonsIOVersion}"
+    api libs.commonsIO
     api "xmlunit:xmlunit:${Deps.xmlunitVersion}"
     api "org.assertj:assertj-core:${Deps.assertjVersion}"
 }

diff --git a/bonita-test-api/build.gradle b/bonita-test-api/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    api "commons-io:commons-io:${Deps.commonsIOVersion}"
+    api libs.commonsIO
     api project(':bonita-engine-standalone')
     api "junit:junit:${Deps.junit4Version}"
     api(project(':platform:platform-resources'))

diff --git a/bpm/bonita-api/bonita-server-api-http/build.gradle b/bpm/bonita-api/bonita-server-api-http/build.gradle
@@ -5,18 +5,18 @@ dependencies {
     api project(':services:bonita-session')
     api project(':bpm:bonita-common')
     api "com.thoughtworks.xstream:xstream:${Deps.xstreamVersion}"
-    api "commons-fileupload:commons-fileupload:${Deps.commonsFileupload}"
-    api "commons-io:commons-io:${Deps.commonsIOVersion}"
-    testImplementation "org.springframework:spring-test:${Deps.springVersion}"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${Deps.junit5Version}"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${Deps.junit5Version}"
-    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${Deps.junit5Version}"
+    api libs.commonsFileUpload
+    api libs.commonsIO
+    testImplementation libs.springTest
+    testImplementation libs.junit5api
+    testRuntimeOnly libs.junitJupiterEngine
+    testImplementation libs.junit4
+    testRuntimeOnly libs.junitVintageEngine
     testImplementation "org.mockito:mockito-junit-jupiter:${Deps.mockitoVersion}"
-    testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
-    testRuntimeOnly "org.springframework:spring-webmvc:${Deps.springVersion}"
+    testRuntimeOnly libs.springWebMvc
     compileOnly "jakarta.servlet:jakarta.servlet-api:${Deps.jakartaServletVersion}"
     testImplementation "jakarta.servlet:jakarta.servlet-api:${Deps.jakartaServletVersion}"
 }

diff --git a/bpm/bonita-common/build.gradle b/bpm/bonita-common/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'java-test-fixtures'
 
 dependencies {
     api platform("com.fasterxml.jackson:jackson-bom:${Deps.jacksonBomVersion}")
-    api platform("org.bonitasoft.engine:bonita-artifacts-model-dependencies:${Deps.bonitaArtifactsModelVersion}")
+    api platform(libs.bonitaArtifactsModelBom)
 
     api "org.bonitasoft.engine:bonita-business-archive"
     api "org.bonitasoft.engine:bonita-business-object-model"

diff --git a/bpm/bonita-core/bonita-home-server/build.gradle b/bpm/bonita-core/bonita-home-server/build.gradle
@@ -2,7 +2,7 @@
 dependencies {
     api project(':services:bonita-commons')
     api project(':bpm:bonita-common')
-    api "commons-io:commons-io:${Deps.commonsIOVersion}"
+    api libs.commonsIO
     api project(':platform:platform-resources')
     testImplementation "junit:junit:${Deps.junit4Version}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"

diff --git a/bpm/bonita-core/bonita-process-engine/build.gradle b/bpm/bonita-core/bonita-process-engine/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 dependencies {
-    api platform("org.bonitasoft.engine:bonita-artifacts-model-dependencies:${Deps.bonitaArtifactsModelVersion}")
+    api platform(libs.bonitaArtifactsModelBom)
 
     api "com.vdurmont:semver4j:${Deps.semver4jVersion}"
     api "org.bonitasoft.engine:bonita-organization-model"
@@ -59,10 +59,10 @@ dependencies {
     api project(':services:bonita-temporary-content')
     api "com.fasterxml.jackson.core:jackson-databind"
     api project(':platform:platform-resources')
-    api "commons-io:commons-io:${Deps.commonsIOVersion}"
-    api "org.springframework:spring-context:${Deps.springVersion}"
-    api "org.springframework.session:spring-session-core:${Deps.springSessionVersion}"
-    api "org.springframework:spring-web:${Deps.springVersion}"
+    api libs.commonsIO
+    api libs.springContext
+    api libs.springSessionCore
+    api libs.springWeb
     api libs.bundles.groovy
     api "io.micrometer:micrometer-core:${Deps.micrometerVersion}"
 
@@ -83,7 +83,7 @@ dependencies {
     testImplementation "org.mockito:mockito-junit-jupiter:${Deps.mockitoVersion}"
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"      // works with Junit4
     testImplementation "com.github.stefanbirkner:system-lambda:${Deps.systemLambdaVersion}"    // works with Junit5
-    testImplementation "org.springframework:spring-test:${Deps.springVersion}"
+    testImplementation libs.springTest
     compileOnly project(':bpm:bonita-common')
     testImplementation testFixtures(project(':bpm:bonita-common'))
     testImplementation "org.awaitility:awaitility:${Deps.awaitilityVersion}"

diff --git a/bpm/bonita-core/bonita-process-instance/build.gradle b/bpm/bonita-core/bonita-process-instance/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    api platform("org.bonitasoft.engine:bonita-artifacts-model-dependencies:${Deps.bonitaArtifactsModelVersion}")
+    api platform(libs.bonitaArtifactsModelBom)
 
     api project(':bpm:bonita-common')
     api project(':bpm:bonita-core:bonita-process-definition')

diff --git a/bpm/bonita-web-server/build.gradle b/bpm/bonita-web-server/build.gradle
@@ -10,11 +10,11 @@ repositories {
 dependencies {
     implementation(project(":bpm:bonita-common"))
     implementation(project(":bpm:bonita-web-extensions"))
-    implementation "commons-io:commons-io:${Deps.commonsIOVersion}"
+    implementation libs.commonsIO
     implementation "org.slf4j:slf4j-api:${Deps.slf4jVersion}"
     implementation "net.sf.ehcache:ehcache:${Deps.ehcacheVersion}"
-    implementation "commons-fileupload:commons-fileupload:${Deps.commonsFileupload}"
-    implementation "commons-beanutils:commons-beanutils:${Deps.commonsBeanutilsVersion}"
+    implementation libs.commonsFileUpload
+    implementation libs.commonsBeanUtils
     implementation "org.apache.commons:commons-collections4:${Deps.commonsCollections4Version}"
     implementation libs.commonsLang
     implementation "com.googlecode.json-simple:json-simple:${Deps.jsonSimpleVersion}"
@@ -32,10 +32,10 @@ dependencies {
     implementation "com.fasterxml.woodstox:woodstox-core:${Deps.woodstoxCoreVersion}"
     implementation libs.groovyCore
     implementation "org.apache.xbean:xbean-classloader:${Deps.xbeanClassloaderVersion}"
-    implementation "org.springframework:spring-core:${Deps.springVersion}"
-    implementation "org.springframework:spring-context:${Deps.springVersion}"
-    implementation "org.springframework:spring-web:${Deps.springVersion}"
-    implementation "org.springframework:spring-webmvc:${Deps.springVersion}"
+    implementation libs.springCore
+    implementation libs.springContext
+    implementation libs.springWeb
+    implementation libs.springWebMvc
     implementation "org.fedorahosted.tennera:jgettext:${Deps.jgettextVersion}"
     implementation "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:${Deps.owaspHTMLSanitizerVersion}"
 
@@ -46,7 +46,7 @@ dependencies {
     testImplementation "net.javacrumbs.json-unit:json-unit:${Deps.jsonUnitVersion}"
     testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"
     testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}"
-    testImplementation "org.springframework:spring-test:${Deps.springVersion}"
+    testImplementation libs.springTest
     testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}"
     testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}"
     testImplementation "org.hamcrest:hamcrest:${Deps.hamcrestVersion}"

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "org.sonarqube" version "3.0"
-    id 'org.barfuin.gradle.taskinfo' version '2.1.0' // Adds a 'tiTree' task to display Gradle task-graph
+    alias(libs.plugins.taskInfo)
 }
 
 sonarqube {

diff --git a/buildSrc/src/main/groovy/Deps.groovy b/buildSrc/src/main/groovy/Deps.groovy
@@ -1,14 +1,5 @@
 class Deps {
 
-    public static String bonitaArtifactsModelVersion = "1.0.0"
-    public static String springVersion = "5.3.32"
-    public static String springBootVersion = "2.7.18"
-    public static String springSessionVersion = "2.7.4"
-    public static String commonsIOVersion = "2.8.0"
-    //fileupload 1.4 does not work on web-side.
-    public static String commonscodec = "1.15"
-    public static String commonsFileupload = "1.5"
-    public static String commonsBeanutilsVersion = "1.9.4"
     public static String commonsCollections4Version = "4.4"
     public static String tomcatDbcpVersion = "9.0.83"
     public static String commonsCLIVersion = "1.4"

diff --git a/common.gradle b/common.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'org.barfuin.gradle.taskinfo'
+apply plugin: libs.plugins.taskInfo.get().pluginId
 
 allprojects {
     apply plugin: 'maven-publish'

diff --git a/engine-settings.gradle b/engine-settings.gradle
@@ -1,14 +1,3 @@
-dependencyResolutionManagement {
-    versionCatalogs {
-        libs {
-            library("lombok", "org.projectlombok:lombok:1.18.30")
-            library("snakeyaml", "org.yaml:snakeyaml:1.32")
-        }
-        testlibs {
-            from(files("gradle/testlibs.versions.toml"))
-        }
-    }
-}
 include(':bonita-engine')
 include(':platform:platform-resources')
 include(':platform:platform-setup')

diff --git a/gradle.properties b/gradle.properties
@@ -4,6 +4,3 @@ org.gradle.vfs.watch=true
 
 version=10.1-SNAPSHOT
 brandingVersion=2024.2-SNAPSHOT
-
-# Version of plugins
-versionsPluginsBonita=0.1.62