diff --git a/bonita-engine-spring-boot-starter/build.gradle b/bonita-engine-spring-boot-starter/build.gradle index cd827cfbe8f..82fd4aa3eeb 100644 --- a/bonita-engine-spring-boot-starter/build.gradle +++ b/bonita-engine-spring-boot-starter/build.gradle @@ -9,7 +9,7 @@ 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) @@ -17,9 +17,9 @@ dependencies { 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 index 75c52337583..4ce6638929c 100644 --- 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 index 879e2963b28..3df75447fc0 100644 --- 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 index f1b36ca7a0d..c62b2d9ae3e 100644 --- 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 index adf6d919354..ae448fdf578 100644 --- 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 index c6f42843a11..c086fe0e272 100644 --- 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 index 3a270ab5fcc..b269a54a20b 100644 --- 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 index 331cc3c8f82..9fc8e92ec88 100644 --- 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 index 46009a444b5..2636a0b4a49 100644 --- 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 index 49a49e38109..eeb601cd3f5 100644 --- 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 index d1b5a6e970f..b7bffd2b35e 100644 --- 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 index cfee84f762d..c7caa86db79 100644 --- 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 index bf709a8ba65..9e356f4119c 100644 --- 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 index 84fd1eb0876..c7e458c0436 100644 --- 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 index 5c36c9a03cb..fca1f0d517b 100644 --- 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 index 00990d771b9..e97fc384e20 100644 --- 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 index b7649060f24..5491b76ef5c 100644 --- 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 index 097f85b77fd..fa82d079fdc 100644 --- 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 index 9b989ec8ab0..fa86865258a 100644 --- 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 index aa7ad4306e0..99cea67ee22 100644 --- 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 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 84726c21eb3..acefff48419 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,10 +2,33 @@ # The groovy version must be in synch with the runtime-bom artifact: groovyVersion = "3.0.19" springVersion = "5.3.32" +springSessionVersion = "2.7.4" springBootVersion = "2.7.18" commonsLangVersion = "3.11" +junit5Version = "5.6.3" +bonitaArtifactsModelVersion = "1.0.0" +commonsIOVersion = "2.8.0" +commonsFileUploadVersion = "1.5" +commonsBeanutilsVersion = "1.9.4" [libraries] +springCore = { module = "org.springframework:spring-core", version.ref = "springVersion" } +springBeans = { module = "org.springframework:spring-beans", version.ref = "springVersion" } +springContext = { module = "org.springframework:spring-context", version.ref = "springVersion" } +springTx = { module = "org.springframework:spring-tx", version.ref = "springVersion" } +springJdbc = { module = "org.springframework:spring-jdbc", version.ref = "springVersion" } +springWebMvc = { module = "org.springframework:spring-webmvc", version.ref = "springVersion" } +springWeb = { module = "org.springframework:spring-web", version.ref = "springVersion" } +springSessionCore = { module = "org.springframework.session:spring-session-core", version.ref = "springSessionVersion" } +springSessionHazelcast = { module = "org.springframework.session:spring-session-hazelcast", version.ref = "springSessionVersion" } + +springBootAutoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure", version.ref = "springBootVersion" } +springBootConfigurationProcessor = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "springBootVersion" } +springBootTest = { module = "org.springframework.boot:spring-boot-test", version.ref = "springBootVersion" } +springBootStarter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springBootVersion" } +springBootStarterJdbc = { module = "org.springframework.boot:spring-boot-starter-jdbc", version.ref = "springBootVersion" } +springBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "springBootVersion" } + 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" } @@ -21,13 +44,42 @@ groovySql = { module = "org.codehaus.groovy:groovy-sql", version.ref = "groovyVe groovyTemplates = { module = "org.codehaus.groovy:groovy-templates", version.ref = "groovyVersion" } groovyYaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovyVersion" } -h2 = "com.h2database:h2:1.4.199" + +bonitaArtifactsModelBom = { module = "org.bonitasoft.engine:bonita-artifacts-model-dependencies", version.ref = "bonitaArtifactsModelVersion" } + +bonitaCommonArtifactsModel = { module = "org.bonitasoft.engine:bonita-common-artifacts-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaBusinessArchiveModel = { module = "org.bonitasoft.engine:bonita-business-archive", version.ref = "bonitaArtifactsModelVersion" } +bonitaProcessDefinitionModel = { module = "org.bonitasoft.engine:bonita-process-definition-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaFormMappingModel = { module = "org.bonitasoft.engine:bonita-form-mapping-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaBusinessObjectModel = { module = "org.bonitasoft.engine:bonita-business-object-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaBdmAccessControlModel = { module = "org.bonitasoft.engine:bonita-bdm-access-control-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaProfileModel = { module = "org.bonitasoft.engine:bonita-profile-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaOrganizationModel = { module = "org.bonitasoft.engine:bonita-organization-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaApplicationModel = { module = "org.bonitasoft.engine:bonita-application-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaConnectorModel = { module = "org.bonitasoft.engine:bonita-connector-model", version.ref = "bonitaArtifactsModelVersion" } commonsLang = { group = "org.apache.commons", name = "commons-lang3", version.ref = "commonsLangVersion" } +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" } + +h2 = "com.h2database:h2:1.4.199" + +lombok = "org.projectlombok:lombok:1.18.30" + +junit5api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit5Version" } +junitJupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit5Version" } +junitVintageEngine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junit5Version" } +junit4 = "junit:junit:4.13.2" +springTest = { module = "org.springframework:spring-test", version.ref = "springVersion" } + [bundles] groovy = ["groovyCore", "groovyServlet", "groovyXml", "groovyJson", "groovyJmx", "groovyNio", "groovyGroovysh", "groovyDatetime", "groovyDateutil", "groovyDocgenerator", "groovyJsr223", "groovySql", "groovyTemplates", "groovyYaml"] [plugins] -dependencyUpdates = { id = "com.github.ben-manes.versions", version = "0.51.0" } \ No newline at end of file +bonitaFormatting = { id = "com.bonitasoft.gradle.bonita-formatting", version = "0.1.63" } +dependencyUpdates = { id = "com.github.ben-manes.versions", version = "0.51.0" } # used by "List out-of-date dependencies" script +taskInfo = { id = "org.barfuin.gradle.taskinfo", version = "2.2.0" } # Adds a 'tiTree' task to display Gradle task-graph \ No newline at end of file diff --git a/gradle/testlibs.versions.toml b/gradle/testlibs.versions.toml deleted file mode 100644 index 4542c908015..00000000000 --- a/gradle/testlibs.versions.toml +++ /dev/null @@ -1,10 +0,0 @@ -[versions] -junit5Version = "5.6.3" - -[libraries] -junit5api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit5Version" } -junitJupiterEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit5Version" } -junitVintageEngine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junit5Version" } - -[bundles] -junit5 = ['junit5api', 'junitJupiterEngine'] diff --git a/platform/platform-resources/build.gradle b/platform/platform-resources/build.gradle index b4e9d49536a..14f5518901f 100644 --- a/platform/platform-resources/build.gradle +++ b/platform/platform-resources/build.gradle @@ -10,11 +10,11 @@ description = '' dependencies { annotationProcessor libs.lombok compileOnly libs.lombok - api "org.springframework:spring-tx:${Deps.springVersion}" - api "org.springframework:spring-jdbc:${Deps.springVersion}" - api "org.springframework:spring-context:${Deps.springVersion}" + api libs.springTx + api libs.springJdbc + api libs.springContext api "org.slf4j:slf4j-api:${Deps.slf4jVersion}" - api "commons-io:commons-io:${Deps.commonsIOVersion}" + api libs.commonsIO testImplementation "junit:junit:${Deps.junit4Version}" testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" diff --git a/platform/platform-setup/build.gradle b/platform/platform-setup/build.gradle index f295107ddfb..974bd192380 100644 --- a/platform/platform-setup/build.gradle +++ b/platform/platform-setup/build.gradle @@ -14,13 +14,13 @@ configurations { dependencies { api "org.apache.commons:commons-text:1.10.0" api "org.slf4j:slf4j-api:${Deps.slf4jVersion}" - api(group: 'org.springframework.boot', name: 'spring-boot-starter', version: Deps.springBootVersion) { + api(libs.springBootStarter) { exclude(module: 'jul-to-slf4j') exclude(module: 'log4j-to-slf4j') exclude(module: 'snakeyaml') } api libs.snakeyaml - api "org.springframework.boot:spring-boot-starter-jdbc:${Deps.springBootVersion}" + api libs.springBootStarterJdbc api "org.postgresql:postgresql:${Deps.postgresqlVersion}" api ("com.mysql:mysql-connector-j:${Deps.mysqlVersion}") { exclude(module: 'protobuf-java') @@ -44,7 +44,7 @@ dependencies { testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testImplementation(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: Deps.springBootVersion) { + testImplementation(libs.springBootStarterTest) { exclude(module: 'json-path') } testImplementation "xmlunit:xmlunit:${Deps.xmlunitVersion}" diff --git a/services/bonita-business-data/bonita-business-data-generator/build.gradle b/services/bonita-business-data/bonita-business-data-generator/build.gradle index 6f8f5c9ad02..ef80a4ffaa6 100644 --- a/services/bonita-business-data/bonita-business-data-generator/build.gradle +++ b/services/bonita-business-data/bonita-business-data-generator/build.gradle @@ -9,7 +9,7 @@ dependencies { api project(':services:bonita-commons') api "org.hibernate:hibernate-core:${Deps.hibernateVersion}" api "org.eclipse.jdt:ecj:${Deps.eclipseCompilerVersion}" - api "org.springframework:spring-core:${Deps.springVersion}" + api libs.springCore api "org.javassist:javassist:${Deps.javassistVersion}" api project(':bpm:bonita-common') api libs.commonsLang diff --git a/services/bonita-business-data/bonita-business-data-impl/build.gradle b/services/bonita-business-data/bonita-business-data-impl/build.gradle index c440f7b903c..0b78e0f2ba1 100644 --- a/services/bonita-business-data/bonita-business-data-impl/build.gradle +++ b/services/bonita-business-data/bonita-business-data-impl/build.gradle @@ -22,8 +22,8 @@ dependencies { testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" testImplementation "org.jboss.narayana.jta:narayana-jta:${Deps.narayanaVersion}" - testImplementation "org.springframework:spring-test:${Deps.springVersion}" - testImplementation "org.springframework:spring-jdbc:${Deps.springVersion}" + testImplementation libs.springTest + testImplementation libs.springJdbc testImplementation testFixtures(project(':bpm:bonita-common')) testRuntimeOnly "org.apache.tomcat:tomcat-dbcp:${Deps.tomcatDbcpVersion}" testRuntimeOnly libs.h2 diff --git a/services/bonita-cache/build.gradle b/services/bonita-cache/build.gradle index 9387b05e811..51c46eeb409 100644 --- a/services/bonita-cache/build.gradle +++ b/services/bonita-cache/build.gradle @@ -4,7 +4,7 @@ dependencies { api "net.sf.ehcache:ehcache:${Deps.ehcacheVersion}" api project(':services:bonita-commons') api project(':services:bonita-session') - api "org.springframework:spring-context:${Deps.springVersion}" + api libs.springContext testImplementation "junit:junit:${Deps.junit4Version}" testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" diff --git a/services/bonita-classloader/build.gradle b/services/bonita-classloader/build.gradle index 0c301cb976d..daf8000f71b 100644 --- a/services/bonita-classloader/build.gradle +++ b/services/bonita-classloader/build.gradle @@ -8,7 +8,7 @@ dependencies { api project(':services:bonita-builder') api project(':services:bonita-persistence') api project(':services:bonita-log') - api "commons-io:commons-io:${Deps.commonsIOVersion}" + api libs.commonsIO // Dependency on javax.annotations as it is not provided anymore in Java 11: api("javax.annotation:javax.annotation-api:${Deps.javaxAnnotationsVersion}") diff --git a/services/bonita-commons/build.gradle b/services/bonita-commons/build.gradle index e0fa1ebc487..7f055048b19 100644 --- a/services/bonita-commons/build.gradle +++ b/services/bonita-commons/build.gradle @@ -1,16 +1,16 @@ import org.bonitasoft.engine.gradle.PomUtils dependencies { - api(group: 'commons-beanutils', name: 'commons-beanutils', version: Deps.commonsBeanutilsVersion) { + api(libs.commonsBeanUtils) { exclude(module: 'commons-collections') } - api "commons-io:commons-io:${Deps.commonsIOVersion}" + api libs.commonsIO api "com.sun.activation:jakarta.activation:${Deps.activationVersion}" api libs.commonsLang api(group: 'com.thoughtworks.xstream', name: 'xstream', version: Deps.xstreamVersion) api "io.micrometer:micrometer-core:${Deps.micrometerVersion}" - api "org.springframework:spring-context:${Deps.springVersion}" - api "org.springframework.boot:spring-boot-autoconfigure:${Deps.springBootVersion}" + api libs.springContext + api libs.springBootAutoconfigure api "org.slf4j:slf4j-api:${Deps.slf4jVersion}" testImplementation "junit:junit:${Deps.junit4Version}" testImplementation "org.junit.jupiter:junit-jupiter-api:${Deps.junit5Version}" diff --git a/services/bonita-work/build.gradle b/services/bonita-work/build.gradle index efd614b9cb7..a1e7f6bb8af 100644 --- a/services/bonita-work/build.gradle +++ b/services/bonita-work/build.gradle @@ -5,8 +5,8 @@ dependencies { api project(':services:bonita-incident') api project(':services:bonita-commons') api project(':services:bonita-transaction') - api "org.springframework:spring-jdbc:${Deps.springVersion}" - api "org.springframework:spring-context:${Deps.springVersion}" + api libs.springJdbc + api libs.springContext testImplementation "junit:junit:${Deps.junit4Version}" testImplementation "org.awaitility:awaitility:${Deps.awaitilityVersion}" testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}"