From 410a770b73084b9b9a29553479030ab158d07668 Mon Sep 17 00:00:00 2001 From: Adrien Kantcheff <5028967+akantcheff@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:10:26 +0200 Subject: [PATCH] chore(gradle): move all deps to the version catalog (#3201) --- .../build.gradle | 4 +- bonita-engine-standalone/build.gradle | 12 +- bonita-engine/build.gradle | 52 +++--- .../benchmarks/build.gradle | 14 +- .../build.gradle | 18 +-- .../build.gradle | 18 +-- .../bonita-integration-tests-web/build.gradle | 8 +- .../bonita-query-tests/build.gradle | 9 +- .../bonita-test-utils/build.gradle | 6 +- bonita-test-api/build.gradle | 10 +- .../bonita-server-api-http/build.gradle | 8 +- bpm/bonita-client/build.gradle | 14 +- .../engine/api/HTTPServerAPIIT.java | 10 +- bpm/bonita-common/build.gradle | 14 +- .../bonita-actor-mapping/build.gradle | 6 +- bpm/bonita-core/bonita-category/build.gradle | 4 +- .../bonita-contract-data/build.gradle | 6 +- bpm/bonita-core/bonita-core-data/build.gradle | 6 +- .../bonita-form-mapping/build.gradle | 6 +- .../bonita-home-server/build.gradle | 10 +- bpm/bonita-core/bonita-login/build.gradle | 8 +- bpm/bonita-core/bonita-parameter/build.gradle | 10 +- .../bonita-platform-login/build.gradle | 4 +- .../bonita-process-definition/build.gradle | 8 +- .../bonita-process-engine/build.gradle | 26 +-- .../bonita-process-instance/build.gradle | 10 +- .../bonita-user-filter/build.gradle | 6 +- bpm/bonita-external/build.gradle | 4 +- .../bonita-synchro-register/build.gradle | 4 +- bpm/bonita-web-extensions/build.gradle | 4 +- bpm/bonita-web-server/build.gradle | 40 ++--- buildSrc/src/main/groovy/Deps.groovy | 59 ------- .../engine/gradle/HttpTestPlugin.groovy | 6 +- .../gradle/docker/DockerDatabasePlugin.groovy | 17 +- .../docker/JdbcDriverDependencies.groovy | 24 --- gradle/libs.versions.toml | 148 +++++++++++++++++- platform/platform-resources/build.gradle | 8 +- platform/platform-setup-test/build.gradle | 2 +- platform/platform-setup/build.gradle | 22 +-- services/bonita-archive/build.gradle | 6 +- services/bonita-authentication/build.gradle | 4 +- services/bonita-authorization/build.gradle | 8 +- .../bonita-business-application/build.gradle | 6 +- .../bonita-business-data-api/build.gradle | 8 +- .../build.gradle | 6 +- .../build.gradle | 10 +- .../bonita-business-data-impl/build.gradle | 22 +-- services/bonita-cache/build.gradle | 6 +- services/bonita-classloader/build.gradle | 12 +- services/bonita-command/build.gradle | 8 +- services/bonita-commons/build.gradle | 23 ++- .../bonita-connector-executor/build.gradle | 10 +- services/bonita-data-instance/build.gradle | 10 +- services/bonita-events/build.gradle | 6 +- services/bonita-expression/build.gradle | 8 +- services/bonita-identity/build.gradle | 6 +- services/bonita-incident/build.gradle | 10 +- services/bonita-lock/build.gradle | 6 +- services/bonita-log/build.gradle | 8 +- services/bonita-page/build.gradle | 8 +- services/bonita-persistence/build.gradle | 12 +- .../build.gradle | 6 +- services/bonita-platform-command/build.gradle | 6 +- services/bonita-platform/build.gradle | 8 +- services/bonita-profile/build.gradle | 4 +- services/bonita-resources/build.gradle | 10 +- services/bonita-scheduler/build.gradle | 12 +- services/bonita-session/build.gradle | 8 +- .../bonita-temporary-content/build.gradle | 10 +- services/bonita-time-tracker/build.gradle | 8 +- services/bonita-transaction/build.gradle | 12 +- services/bonita-work/build.gradle | 12 +- 72 files changed, 502 insertions(+), 442 deletions(-) delete mode 100644 buildSrc/src/main/groovy/Deps.groovy delete mode 100644 buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/JdbcDriverDependencies.groovy diff --git a/bonita-engine-spring-boot-starter/build.gradle b/bonita-engine-spring-boot-starter/build.gradle index 82fd4aa3eeb..0ab3c9d4db5 100644 --- a/bonita-engine-spring-boot-starter/build.gradle +++ b/bonita-engine-spring-boot-starter/build.gradle @@ -20,8 +20,8 @@ dependencies { annotationProcessor(libs.springBootConfigurationProcessor) testImplementation(libs.springBootTest) - testImplementation("junit:junit:${Deps.junit4Version}") - testImplementation("org.assertj:assertj-core:${Deps.assertjVersion}") + testImplementation(libs.junit4) + testImplementation(libs.assertj) } tasks.register("sourcesJar", Jar) { diff --git a/bonita-engine-standalone/build.gradle b/bonita-engine-standalone/build.gradle index f349c309c44..43dc6df225d 100644 --- a/bonita-engine-standalone/build.gradle +++ b/bonita-engine-standalone/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation(project(':platform:platform-resources')) implementation libs.springContext - implementation "org.jboss.narayana.jta:narayana-jta:${Deps.narayanaVersion}" + implementation libs.narayanaJta implementation libs.tomcatDbcp implementation libs.slf4jApi runtimeOnly libs.h2 @@ -21,11 +21,11 @@ dependencies { annotationProcessor libs.lombok compileOnly libs.lombok - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testImplementation "org.postgresql:postgresql:${Deps.postgresqlVersion}" - testImplementation "com.mysql:mysql-connector-j:${Deps.mysqlVersion}" + testImplementation libs.assertj + testImplementation libs.junit4 + testImplementation libs.systemRules + testImplementation libs.postgresql + testImplementation libs.mysql testImplementation libs.h2 } diff --git a/bonita-engine/build.gradle b/bonita-engine/build.gradle index 8176139108d..d0bd90f181e 100644 --- a/bonita-engine/build.gradle +++ b/bonita-engine/build.gradle @@ -31,8 +31,8 @@ dependencyManagement { exclude 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec' } dependency(libs.hibernateJCache.get() as String) - dependency("javax.cache:cache-api:${Deps.jcacheVersion}") - dependency "javax.persistence:javax.persistence-api:${Deps.javaxPersistenceApiVersion}" + dependency(libs.jcache.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) { @@ -49,18 +49,18 @@ dependencyManagement { } dependency libs.xstream.get() as String dependency libs.tomcatDbcp.get() as String - dependency "org.jboss.narayana.jta:narayana-jta:${Deps.narayanaVersion}" + dependency libs.narayanaJta.get() as String dependency libs.jakartaActivation.get() as String dependency libs.snakeyaml.get() as String - dependency("org.quartz-scheduler:quartz:${Deps.quartzVersion}") + dependency(libs.quartz.get() as String) dependency(libs.eclipseCompiler.get() as String) - dependency("javax.annotation:javax.annotation-api:$Deps.javaxAnnotationsVersion") - dependencySet(group: "io.micrometer", version: Deps.micrometerVersion) { + 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: Deps.hazelcastVersion) { + dependencySet(group: 'com.hazelcast', version: libs.versions.hazelcastVersion.get()) { entry 'hazelcast' entry 'hazelcast-spring' } @@ -86,40 +86,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 index 86681c9e4a7..9bff078646b 100644 --- a/bonita-integration-tests/benchmarks/build.gradle +++ b/bonita-integration-tests/benchmarks/build.gradle @@ -3,15 +3,15 @@ plugins { } dependencies { - api "junit:junit:${Deps.junit4Version}" - api "org.assertj:assertj-core:${Deps.assertjVersion}" - api "org.mockito:mockito-core:${Deps.mockitoVersion}" + api libs.junit4 + api libs.assertj + api libs.mockitoCore api project(':bonita-integration-tests:bonita-integration-tests-client') api project(':bpm:bonita-server') - runtimeOnly "com.mysql:mysql-connector-j:${Deps.mysqlVersion}" - runtimeOnly "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}" - runtimeOnly "org.postgresql:postgresql:${Deps.postgresqlVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + runtimeOnly libs.mysql + runtimeOnly libs.msSqlServer + runtimeOnly libs.postgresql + testRuntimeOnly libs.logback } jmh { diff --git a/bonita-integration-tests/bonita-integration-tests-client/build.gradle b/bonita-integration-tests/bonita-integration-tests-client/build.gradle index c62b2d9ae3e..368a05a71ee 100644 --- a/bonita-integration-tests/bonita-integration-tests-client/build.gradle +++ b/bonita-integration-tests/bonita-integration-tests-client/build.gradle @@ -5,21 +5,21 @@ plugins { } dependencies { api project(':bonita-test-api') - api "junit:junit:${Deps.junit4Version}" + api libs.junit4 api libs.commonsIO 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}" - runtimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + 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 index 5af254406e0..ea8a52d351d 100644 --- a/bonita-integration-tests/bonita-integration-tests-local/build.gradle +++ b/bonita-integration-tests/bonita-integration-tests-local/build.gradle @@ -3,21 +3,21 @@ plugins { id("bonita-tests") } dependencies { - api "junit:junit:${Deps.junit4Version}" - api "org.assertj:assertj-core:${Deps.assertjVersion}" - api "org.mockito:mockito-core:${Deps.mockitoVersion}" + api libs.junit4 + 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 - runtimeOnly "com.mysql:mysql-connector-j:${Deps.mysqlVersion}" - runtimeOnly "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}" - runtimeOnly "org.postgresql:postgresql:${Deps.postgresqlVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + runtimeOnly libs.mysql + runtimeOnly libs.msSqlServer + runtimeOnly libs.postgresql + 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 index 294d7eca9eb..30109d74bbd 100644 --- a/bonita-integration-tests/bonita-integration-tests-web/build.gradle +++ b/bonita-integration-tests/bonita-integration-tests-web/build.gradle @@ -13,10 +13,10 @@ dependencies { implementation libs.commonsIO implementation libs.jakartaServletApi 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 index b269a54a20b..359de71e9e5 100644 --- a/bonita-integration-tests/bonita-query-tests/build.gradle +++ b/bonita-integration-tests/bonita-query-tests/build.gradle @@ -1,16 +1,15 @@ dependencies { - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" + testImplementation libs.junit4 + 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 index 9fc8e92ec88..def2e8f8d5a 100644 --- a/bonita-integration-tests/bonita-test-utils/build.gradle +++ b/bonita-integration-tests/bonita-test-utils/build.gradle @@ -2,10 +2,10 @@ dependencies { api project(':bpm:bonita-client') api project(':bpm:bonita-common') api project(':bonita-test-api') - api "junit:junit:${Deps.junit4Version}" + api libs.junit4 api libs.commonsIO - api "xmlunit:xmlunit:${Deps.xmlunitVersion}" - api "org.assertj:assertj-core:${Deps.assertjVersion}" + api libs.xmlunit + api libs.assertj } publishing { diff --git a/bonita-test-api/build.gradle b/bonita-test-api/build.gradle index 2636a0b4a49..734b8ece093 100644 --- a/bonita-test-api/build.gradle +++ b/bonita-test-api/build.gradle @@ -1,20 +1,20 @@ dependencies { api libs.commonsIO api project(':bonita-engine-standalone') - api "junit:junit:${Deps.junit4Version}" + api libs.junit4 api(project(':platform:platform-resources')) // 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 index cc59afac8d7..e521dba2c9e 100644 --- a/bpm/bonita-api/bonita-server-api-http/build.gradle +++ b/bpm/bonita-api/bonita-server-api-http/build.gradle @@ -12,10 +12,10 @@ dependencies { testRuntimeOnly libs.junitJupiterEngine testImplementation libs.junit4 testRuntimeOnly libs.junitVintageEngine - 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 index 3ab9e4eaa9c..a905b4ebf9b 100644 --- a/bpm/bonita-client/build.gradle +++ b/bpm/bonita-client/build.gradle @@ -10,14 +10,12 @@ dependencies { api libs.httpComponentsClient api libs.xstream api libs.httpComponentsMime - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - 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.junit4 + testImplementation libs.assertj + testImplementation libs.logback + 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 index d7a9e14d284..04e20d03e8d 100644 --- 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 index eda0e4f49bc..65df762fc95 100644 --- a/bpm/bonita-common/build.gradle +++ b/bpm/bonita-common/build.gradle @@ -22,17 +22,17 @@ dependencies { annotationProcessor libs.lombok testImplementation project(':bpm:bonita-sap-jco-connector-api') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - testImplementation 'org.jmockit:jmockit:1.44' - testImplementation "net.javacrumbs.json-unit:json-unit-fluent:${Deps.jsonUnitVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback + 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 index ec7ae64cb19..8302cc28bb9 100644 --- a/bpm/bonita-core/bonita-actor-mapping/build.gradle +++ b/bpm/bonita-core/bonita-actor-mapping/build.gradle @@ -7,9 +7,9 @@ dependencies { api project(':services:bonita-events') api project(':services:bonita-log') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" + testImplementation libs.junit4 + 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 index 4e837dd2288..2040855d348 100644 --- a/bpm/bonita-core/bonita-category/build.gradle +++ b/bpm/bonita-core/bonita-category/build.gradle @@ -7,8 +7,8 @@ dependencies { api project(':services:bonita-events') api project(':services:bonita-log') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + 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 index 9f6f88764d8..2337b70aaa7 100644 --- a/bpm/bonita-core/bonita-contract-data/build.gradle +++ b/bpm/bonita-core/bonita-contract-data/build.gradle @@ -6,9 +6,9 @@ dependencies { api project(':services:bonita-log') api project(':services:bonita-archive') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + 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 index 9e2233f0433..cf3d6104388 100644 --- a/bpm/bonita-core/bonita-core-data/build.gradle +++ b/bpm/bonita-core/bonita-core-data/build.gradle @@ -6,7 +6,7 @@ dependencies { api libs.commonsLang api project(':services:bonita-cache') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + 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 index fab9695298a..aea34a5c38c 100644 --- a/bpm/bonita-core/bonita-form-mapping/build.gradle +++ b/bpm/bonita-core/bonita-form-mapping/build.gradle @@ -10,9 +10,9 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-events') api libs.hibernateCore - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + 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 index c7caa86db79..c7ad1f6bfb2 100644 --- a/bpm/bonita-core/bonita-home-server/build.gradle +++ b/bpm/bonita-core/bonita-home-server/build.gradle @@ -4,9 +4,9 @@ dependencies { api project(':bpm:bonita-common') api libs.commonsIO api project(':platform:platform-resources') - 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 "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + 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 index a99ceb60693..af2d9e56711 100644 --- a/bpm/bonita-core/bonita-login/build.gradle +++ b/bpm/bonita-core/bonita-login/build.gradle @@ -6,10 +6,10 @@ dependencies { api project(':services:bonita-authentication') api project(':services:bonita-profile') api project(':services:bonita-authorization') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj + testImplementation libs.logback compileOnly libs.lombok annotationProcessor libs.lombok diff --git a/bpm/bonita-core/bonita-parameter/build.gradle b/bpm/bonita-core/bonita-parameter/build.gradle index 23b4167cbb3..a2543c28fe3 100644 --- a/bpm/bonita-core/bonita-parameter/build.gradle +++ b/bpm/bonita-core/bonita-parameter/build.gradle @@ -7,11 +7,11 @@ dependencies { api project(':services:bonita-cache') api project(':services:bonita-builder') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj + testImplementation libs.systemRules + testRuntimeOnly libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/bpm/bonita-core/bonita-platform-login/build.gradle b/bpm/bonita-core/bonita-platform-login/build.gradle index 6f24ab7021b..f5feb9734dc 100644 --- a/bpm/bonita-core/bonita-platform-login/build.gradle +++ b/bpm/bonita-core/bonita-platform-login/build.gradle @@ -4,6 +4,6 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-platform-session') api project(':services:bonita-platform-authentication') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore } diff --git a/bpm/bonita-core/bonita-process-definition/build.gradle b/bpm/bonita-core/bonita-process-definition/build.gradle index f425e2cf21a..6f06cb4b8cf 100644 --- a/bpm/bonita-core/bonita-process-definition/build.gradle +++ b/bpm/bonita-core/bonita-process-definition/build.gradle @@ -12,10 +12,10 @@ dependencies { api project(':services:bonita-data-instance') api project(':services:bonita-classloader') api project(':services:bonita-builder') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/bpm/bonita-core/bonita-process-engine/build.gradle b/bpm/bonita-core/bonita-process-engine/build.gradle index ec3361290ce..ed884f6b7b2 100644 --- a/bpm/bonita-core/bonita-process-engine/build.gradle +++ b/bpm/bonita-core/bonita-process-engine/build.gradle @@ -64,30 +64,30 @@ dependencies { api libs.springSessionCore api libs.springWeb api libs.bundles.groovy - api "io.micrometer:micrometer-core:${Deps.micrometerVersion}" + api libs.micrometerCore // Dependency on javax.annotations as it is not provided anymore in Java 11: - api("javax.annotation:javax.annotation-api:${Deps.javaxAnnotationsVersion}") + api(libs.javaxAnnotations) annotationProcessor libs.lombok compileOnly libs.lombok - testImplementation "org.junit.jupiter:junit-jupiter-api:${Deps.junit5Version}" - testImplementation "org.junit.jupiter:junit-jupiter-params:${Deps.junit5Version}" - testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${Deps.junit5Version}" - testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${Deps.junit5Version}" + testImplementation libs.junit5api + testImplementation libs.junit5params + testRuntimeOnly libs.junitJupiterEngine + testRuntimeOnly libs.junitVintageEngine testAnnotationProcessor libs.lombok - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - 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 libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoJunitJupiter + testImplementation libs.systemRules // works with Junit4 + testImplementation libs.systemLambda // works with Junit5 testImplementation libs.springTest compileOnly project(':bpm:bonita-common') testImplementation testFixtures(project(':bpm:bonita-common')) - testImplementation "org.awaitility:awaitility:${Deps.awaitilityVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.awaitility + testRuntimeOnly libs.logback } test { diff --git a/bpm/bonita-core/bonita-process-instance/build.gradle b/bpm/bonita-core/bonita-process-instance/build.gradle index c7e458c0436..d4b0f005f19 100644 --- a/bpm/bonita-core/bonita-process-instance/build.gradle +++ b/bpm/bonita-core/bonita-process-instance/build.gradle @@ -23,12 +23,12 @@ dependencies { api project(':bpm:bonita-core:bonita-contract-data') api 'org.bonitasoft.engine:bonita-connector-model' - 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}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.systemRules - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testRuntimeOnly libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/bpm/bonita-core/bonita-user-filter/build.gradle b/bpm/bonita-core/bonita-user-filter/build.gradle index fdaef84593c..ca4a8fd1f12 100644 --- a/bpm/bonita-core/bonita-user-filter/build.gradle +++ b/bpm/bonita-core/bonita-user-filter/build.gradle @@ -11,7 +11,7 @@ dependencies { api project(':bpm:bonita-core:bonita-process-instance') api project(':bpm:bonita-core:bonita-home-server') api project(':services:bonita-commons') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore } diff --git a/bpm/bonita-external/build.gradle b/bpm/bonita-external/build.gradle index 2499ce60146..0c6c96bb295 100644 --- a/bpm/bonita-external/build.gradle +++ b/bpm/bonita-external/build.gradle @@ -4,6 +4,6 @@ dependencies { api project(':bpm:bonita-core:bonita-process-engine') api project(':services:bonita-command') api project(':bpm:bonita-core:bonita-process-definition') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore } diff --git a/bpm/bonita-synchro-repository/bonita-synchro-register/build.gradle b/bpm/bonita-synchro-repository/bonita-synchro-register/build.gradle index 9807d2e4ad4..c88bc1cd6e3 100644 --- a/bpm/bonita-synchro-repository/bonita-synchro-register/build.gradle +++ b/bpm/bonita-synchro-repository/bonita-synchro-register/build.gradle @@ -4,6 +4,6 @@ dependencies { api project(':bpm:bonita-core:bonita-process-engine') api project(':bpm:bonita-synchro-repository:bonita-synchro-service-impl') api project(':services:bonita-commons') - compileOnly 'jakarta.jms:jakarta.jms-api:3.0.0' - compileOnly 'org.apache.activemq:activemq-client:5.16.6' + compileOnly libs.jakartaJmsApi + compileOnly libs.activemqClient } diff --git a/bpm/bonita-web-extensions/build.gradle b/bpm/bonita-web-extensions/build.gradle index 2b8f120aea2..cad45478333 100644 --- a/bpm/bonita-web-extensions/build.gradle +++ b/bpm/bonita-web-extensions/build.gradle @@ -4,8 +4,8 @@ dependencies { api(libs.javaxServletApi) api(project(":bpm:bonita-client")) api(project(":bpm:bonita-common")) - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj } group = 'org.bonitasoft.web' diff --git a/bpm/bonita-web-server/build.gradle b/bpm/bonita-web-server/build.gradle index dcf35c7a616..1921aa8b5a8 100644 --- a/bpm/bonita-web-server/build.gradle +++ b/bpm/bonita-web-server/build.gradle @@ -17,48 +17,48 @@ dependencies { implementation libs.commonsBeanUtils implementation libs.commonsCollections implementation libs.commonsLang - implementation "com.googlecode.json-simple:json-simple:${Deps.jsonSimpleVersion}" - implementation "org.tuckey:urlrewritefilter:${Deps.urlrewriteVersion}" - implementation "org.glassfish.web:jakarta.servlet.jsp.jstl:${Deps.jakartaJstlVersion}" - implementation "jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:${Deps.jakartaJstlApiVersion}" - implementation "org.restlet.jse:org.restlet:${Deps.restletVersion}" - implementation("org.restlet.jee:org.restlet.ext.servlet:${Deps.restletVersion}") { + implementation libs.jsonSimple + implementation libs.urlrewritefilter + implementation libs.jakartaJstl + implementation libs.jakartaJstlApi + implementation libs.restlet + implementation(libs.restletServlet) { exclude(group: "org.restlet.jee", module: "org.restlet") } - implementation("org.restlet.jse:org.restlet.ext.jackson:${Deps.restletVersion}") { + implementation(libs.restletJackson) { exclude(group: "org.codehaus.woodstox", module: "woodstox-core-asl") exclude(group: "org.codehaus.woodstox", module: "stax2-api") } - implementation "com.fasterxml.woodstox:woodstox-core:${Deps.woodstoxCoreVersion}" + implementation libs.woodstoxCore implementation libs.groovyCore - implementation "org.apache.xbean:xbean-classloader:${Deps.xbeanClassloaderVersion}" + implementation libs.xbeanClassloader 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}" + implementation libs.jgettext + implementation libs.owaspHtmlSanitizer compileOnly libs.lombok annotationProcessor libs.lombok testImplementation(project(":bpm:bonita-server")) - 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 libs.jsonUnit + testImplementation libs.assertj + testImplementation libs.logback testImplementation libs.springTest - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.hamcrest:hamcrest:${Deps.hamcrestVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" + testImplementation libs.systemRules + testImplementation libs.mockitoCore + testImplementation libs.hamcrest + testImplementation libs.junit4 } configurations { all { // Specify woodstox version to override the version pulled by jackson-dataformat-xml (transitive dep of restlet) - resolutionStrategy.force "com.fasterxml.woodstox:woodstox-core:${Deps.woodstoxCoreVersion}" + resolutionStrategy.force libs.woodstoxCore // Specify Guava version to override the version pulled by owasp-java-html-sanitizer - resolutionStrategy.force "com.google.guava:guava:${Deps.guavaVersion}" //forcing managed version (transitive dependency of owasp-java-html-sanitizer) + resolutionStrategy.force libs.guava //forcing managed version (transitive dependency of owasp-java-html-sanitizer) } tests } diff --git a/buildSrc/src/main/groovy/Deps.groovy b/buildSrc/src/main/groovy/Deps.groovy deleted file mode 100644 index 4153bd54c14..00000000000 --- a/buildSrc/src/main/groovy/Deps.groovy +++ /dev/null @@ -1,59 +0,0 @@ -class Deps { - - public static String quartzVersion = "2.3.2" - public static String micrometerVersion = "1.6.1" - - public static String mysqlVersion = "8.2.0" - public static String mssqlVersion = "8.4.1.jre8" - public static String oracleVersion = "19.3.0.0" - public static String postgresqlVersion = "42.4.4" - - public static String narayanaVersion = "5.10.6.Final" - public static String jaxbVersion = "2.3.1" - public static String logbackVersion = "1.2.13" - public static String javaxAnnotationsVersion = "1.3.2" - - // extensions versions - public static String hazelcastVersion = "5.3.5" - public static String jcacheVersion = "1.0.0" - // javax.persistence-api used by hibernate - public static String javaxPersistenceApiVersion = "2.2" - - public static String guavaVersion = "32.1.2-jre" - public static String antlr4RuntimeVersion = "4.7.2" - - // bonita-web specific dependencies: - public static String jsonSimpleVersion = "1.1" - public static String urlrewriteVersion = "4.0.3" - public static String jakartaJstlVersion = "1.2.6" - public static String jakartaJstlApiVersion = "1.2.7" - public static String restletVersion = "2.3.12" - public static String xbeanClassloaderVersion = "3.7" - public static String jgettextVersion = "0.13" - public static String hamcrestVersion = "2.1" - public static String woodstoxCoreVersion = "6.4.0" - // When updating Keycloak version, if necessary, make sure to update the code in - // subscription/bpm/bonita-web-server-sp package org.bonitasoft.console.common.server.auth.impl - public static String keycloakVersion = "21.1.2" - public static String xmlsecVersion = "2.2.6" - public static String bouncyCastleVersion = "1.78.1" - public static String spnegoVersion = "1.1.1" - public static String owaspHTMLSanitizerVersion = "20220608.1" - - // Test dependency versions: - public static String junit4Version = "4.13.2" - public static String junit5Version = "5.6.3" - public static String awaitilityVersion = "4.0.3" - public static String assertjVersion = "3.17.2" - public static String xmlunitVersion = "1.6" - public static String mockitoVersion = "3.5.10" - public static String jsonUnitVersion = "2.19.0" - public static String systemRulesVersion = "1.19.0" - public static String systemLambdaVersion = "1.2.0" - public static String concurrentUnitVersion = "0.4.6" - public static String junitQuickCheck = "1.0" - public static String jettyVersion = "9.4.9.v20180320" - public static String jbossLoggingVersion = "3.1.3.GA" - public static String commonsExecVersion = "1.3" - -} diff --git a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/HttpTestPlugin.groovy b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/HttpTestPlugin.groovy index 0f1adb08d91..2dc78cef91a 100644 --- a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/HttpTestPlugin.groovy +++ b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/HttpTestPlugin.groovy @@ -2,6 +2,7 @@ package org.bonitasoft.engine.gradle import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.artifacts.VersionCatalogsExtension import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.testing.Test @@ -36,8 +37,9 @@ class HttpTestPlugin implements Plugin { httpTestConfig } project.dependencies { - httpTestConfig "org.eclipse.jetty:jetty-server:${Deps.jettyVersion}" - httpTestConfig "org.eclipse.jetty:jetty-servlet:${Deps.jettyVersion}" + def versionCatalog = project.extensions.getByType(VersionCatalogsExtension.class).named("libs") + httpTestConfig(versionCatalog.findLibrary("jettyServer").get()) + httpTestConfig(versionCatalog.findLibrary("jettyServlet").get()) } httpIntegrationTests.configure { classpath += project.configurations.httpTestConfig } diff --git a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabasePlugin.groovy b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabasePlugin.groovy index 133d93a0ff7..7d8ce67e3c0 100644 --- a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabasePlugin.groovy +++ b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/DockerDatabasePlugin.groovy @@ -2,6 +2,8 @@ package org.bonitasoft.engine.gradle.docker import org.gradle.api.Plugin import org.gradle.api.Project +import org.gradle.api.artifacts.VersionCatalogsExtension + /** * @author Emmanuel Duchastenier */ @@ -12,9 +14,7 @@ class DockerDatabasePlugin implements Plugin { project.configurations { drivers } - - defineJdbcDriversConfiguration(project) - + driversConfiguration(project) def databaseIntegrationTest = project.extensions.create("databaseIntegrationTest", DatabasePluginExtension) DockerDatabaseContainerTasksCreator.createTasks(project, databaseIntegrationTest) @@ -26,13 +26,14 @@ class DockerDatabasePlugin implements Plugin { } } - def defineJdbcDriversConfiguration(Project project) { + def driversConfiguration(project) { project.dependencies { // the following jdbc drivers are available for integration tests - drivers JdbcDriverDependencies.mysql - drivers JdbcDriverDependencies.oracle - drivers JdbcDriverDependencies.postgres - drivers JdbcDriverDependencies.sqlserver + def versionCatalog = project.extensions.getByType(VersionCatalogsExtension.class).named("libs") + drivers(versionCatalog.findLibrary("mysql").get()) + drivers(versionCatalog.findLibrary("oracle").get()) + drivers(versionCatalog.findLibrary("postgresql").get()) + drivers(versionCatalog.findLibrary("msSqlServer").get()) } } } diff --git a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/JdbcDriverDependencies.groovy b/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/JdbcDriverDependencies.groovy deleted file mode 100644 index c999a6b9749..00000000000 --- a/buildSrc/src/main/groovy/org/bonitasoft/engine/gradle/docker/JdbcDriverDependencies.groovy +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (C) 2018 Bonitasoft S.A. - * BonitaSoft, 32 rue Gustave Eiffel - 38000 Grenoble - * This library is free software; you can redistribute it and/or modify it under the terms - * of the GNU Lesser General Public License as published by the Free Software Foundation - * version 2.1 of the License. - * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth - * Floor, Boston, MA 02110-1301, USA. - **/ - -package org.bonitasoft.engine.gradle.docker - -class JdbcDriverDependencies { - - final static String mysql = "com.mysql:mysql-connector-j:${Deps.mysqlVersion}" - final static String oracle = "com.oracle.database.jdbc:ojdbc8:${Deps.oracleVersion}" - final static String postgres = "org.postgresql:postgresql:${Deps.postgresqlVersion}" - final static String sqlserver = "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}" - -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 51154acfb2d..3cd869745a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,20 +5,23 @@ springVersion = "5.3.39" springSessionVersion = "2.7.4" springBootVersion = "2.7.18" commonsLangVersion = "3.11" -junit5Version = "5.10.2" bonitaArtifactsModelVersion = "1.0.0" +bonitaSecurityVersion = "1.25.11" commonsIOVersion = "2.8.0" commonsFileUploadVersion = "1.5" commonsBeanutilsVersion = "1.9.4" commonsCollectionsVersion = "4.4" -tomcatDbcpVersion = "9.0.93" +tomcatVersion = "9.0.93" commonsCLIVersion = "1.4" +commonsTextVersion = "1.10.0" 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" +# javax.persistence-api is used by hibernate: +javaxPersistenceApiVersion = "2.2" jacksonBomVersion = "2.15.3" jakartaTransactionVersion = "1.3.3" jakartaServletVersion = "4.0.4" @@ -29,6 +32,64 @@ xstreamVersion = "1.4.20" ehCacheVersion = "2.10.10.12.7" eclipseCompilerVersion = "3.20.0" jakartaActivationVersion = "1.2.2" +quartzVersion = "2.3.2" +micrometerVersion = "1.6.1" +# DB drivers: +mysqlVersion = "8.2.0" +msSqlServerVersion = "8.4.1.jre8" +oracleVersion = "19.3.0.0" +postgresqlVersion = "42.4.4" + +narayanaVersion = "5.10.6.Final" +logbackVersion = "1.2.13" +jaxbVersion = "2.3.1" +javaxAnnotationsVersion = "1.3.2" +hazelcastVersion = "5.3.5" # Also update http://www.hazelcast.com/schema/config/hazelcast-config-.xsd if needed +jcacheVersion = "1.0.0" +guavaVersion = "32.1.2-jre" +antlr4RuntimeVersion = "4.7.2" +casClientCoreVersion = "4.0.4" +jtidyVersion = "r938" +jakartaJmsVersion = "3.0.0" +activemqVersion = "5.16.2" +squigglyFilterJacksonVersion = "1.3.18" + +# bonita-web specific dependencies: +jsonSimpleVersion = "1.1" +urlrewritefilterVersion = "4.0.3" +jakartaJstlVersion = "1.2.6" +jakartaJstlApiVersion = "1.2.7" +restletVersion = "2.3.12" +xbeanClassloaderVersion = "3.7" +jgettextVersion = "0.13" +hamcrestVersion = "2.1" +woodstoxCoreVersion = "6.4.0" +# When updating Keycloak version, if necessary, make sure to update the code in +# subscription/bpm/bonita-web-server-sp package org.bonitasoft.console.common.server.auth.impl +keycloakVersion = "21.1.2" +xmlsecVersion = "2.2.6" +bouncyCastleVersion = "1.78.1" +spnegoVersion = "1.1.1" +owaspHtmlSanitizerVersion = "20220608.1" + +# Test dependency versions +junit4Version = "4.13.2" +junit5Version = "5.10.2" +awaitilityVersion = "4.0.3" +assertjVersion = "3.17.2" +xmlunitVersion = "1.6" +mockitoVersion = "3.5.10" +jsonUnitVersion = "2.19.0" +systemRulesVersion = "1.19.0" +systemLambdaVersion = "1.2.0" +concurrentUnitVersion = "0.4.6" +junitQuickCheck = "1.0" +jettyVersion = "9.4.9.v20180320" +jbossLoggingVersion = "3.1.3.GA" +commonsExecVersion = "1.3" +jmockitVersion = "1.44" +mockServerJunitVersion = "5.14.0" + [libraries] springCore = { module = "org.springframework:spring-core", version.ref = "springVersion" } @@ -38,6 +99,7 @@ springTx = { module = "org.springframework:spring-tx", version.ref = "springVers 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" } +springOrm = { module = "org.springframework:spring-orm", 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" } @@ -78,19 +140,27 @@ bonitaOrganizationModel = { module = "org.bonitasoft.engine:bonita-organization- bonitaApplicationModel = { module = "org.bonitasoft.engine:bonita-application-model", version.ref = "bonitaArtifactsModelVersion" } bonitaConnectorModel = { module = "org.bonitasoft.engine:bonita-connector-model", version.ref = "bonitaArtifactsModelVersion" } +bonitaManager = { group = "com.bonitasoft.manager", name = "manager", version.ref = "bonitaSecurityVersion" } +bonitaTestLicenses = { group = "org.bonitasoft.security", name = "test-licenses", version.ref = "bonitaSecurityVersion" } + +guava = { group = "com.google.guava", name = "guava", version.ref = "guavaVersion" } +antlr4Runtime = { group = "org.antlr", name = "antlr4-runtime", version.ref = "antlr4RuntimeVersion" } 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" } commonsCollections = { group = "org.apache.commons", name = "commons-collections4", version.ref = "commonsCollectionsVersion" } -tomcatDbcp = { group = "org.apache.tomcat", name = "tomcat-dbcp", version.ref = "tomcatDbcpVersion" } +tomcatDbcp = { group = "org.apache.tomcat", name = "tomcat-dbcp", version.ref = "tomcatVersion" } commonsCLI = { group = "commons-cli", name = "commons-cli", version.ref = "commonsCLIVersion" } +commonsText = { group = "org.apache.commons", name = "commons-text", version.ref = "commonsTextVersion" } 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" } +javaxPersistenceApi = { group = "javax.persistence", name = "javax.persistence-api", version.ref = "javaxPersistenceApiVersion" } hibernateJCache = { group = "org.hibernate", name = "hibernate-jcache", version.ref = "hibernateVersion" } +jcache = { group = "javax.cache", name = "cache-api", version.ref = "jcacheVersion" } javassist = { group = "org.javassist", name = "javassist", version.ref = "javassistVersion" } jacksonBom = { group = "com.fasterxml.jackson", name = "jackson-bom", version.ref = "jacksonBomVersion" } @@ -106,18 +176,88 @@ xstream = { group = "com.thoughtworks.xstream", name = "xstream", version.ref = ehCache = { group = "net.sf.ehcache", name = "ehcache", version.ref = "ehCacheVersion" } eclipseCompiler = { group = "org.eclipse.jdt", name = "ecj", version.ref = "eclipseCompilerVersion" } jakartaActivation = { group = "com.sun.activation", name = "jakarta.activation", version.ref = "jakartaActivationVersion" } +javaxAnnotations = { group = "javax.annotation", name = "javax.annotation-api", version.ref = "javaxAnnotationsVersion" } +hazelcast = { group = "com.hazelcast", name = "hazelcast", version.ref = "hazelcastVersion" } +hazelcastSpring = { group = "com.hazelcast", name = "hazelcast-spring", version.ref = "hazelcastVersion" } +quartz = { group = "org.quartz-scheduler", name = "quartz", version.ref = "quartzVersion" } +micrometerCore = { group = "io.micrometer", name = "micrometer-core", version.ref = "micrometerVersion" } +micrometerRegistryJmx = { group = "io.micrometer", name = "micrometer-registry-jmx", version.ref = "micrometerVersion" } +micrometerRegistryPrometheus = { group = "io.micrometer", name = "micrometer-registry-prometheus", version.ref = "micrometerVersion" } + +narayanaJta = { group = "org.jboss.narayana.jta", name = "narayana-jta", version.ref = "narayanaVersion" } +jaxbCodeModel = { group = "org.glassfish.jaxb", name = "codemodel", version.ref = "jaxbVersion" } h2 = "com.h2database:h2:1.4.199" +mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysqlVersion" } +msSqlServer = { group = "com.microsoft.sqlserver", name = "mssql-jdbc", version.ref = "msSqlServerVersion" } +oracle = { group = "com.oracle.database.jdbc", name = "ojdbc8", version.ref = "oracleVersion" } +postgresql = { group = "org.postgresql", name = "postgresql", version.ref = "postgresqlVersion" } lombok = "org.projectlombok:lombok:1.18.30" +logback = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logbackVersion" } + +casClientCore = { group = "org.apereo.cas.client", name = "cas-client-core", version.ref = "casClientCoreVersion" } +jtidy = { group = "net.sf.jtidy", name = "jtidy", version.ref = "jtidyVersion" } + +jakartaJmsApi = { group = "jakarta.jms", name = "jakarta.jms-api", version.ref = "jakartaJmsVersion" } +activemqClient = { group = "org.apache.activemq", name = "activemq-client", version.ref = "activemqVersion" } + +squigglyFilterJackson = { group = "com.github.bohnman", name = "squiggly-filter-jackson", version.ref = "squigglyFilterJacksonVersion" } + + +# bonita-web specific dependencies: +jsonSimple = { group = "com.googlecode.json-simple", name = "json-simple", version.ref = "jsonSimpleVersion" } +urlrewritefilter = { group = "org.tuckey", name = "urlrewritefilter", version.ref = "urlrewritefilterVersion" } +jakartaJstl = { group = "org.glassfish.web", name = "jakarta.servlet.jsp.jstl", version.ref = "jakartaJstlVersion" } +jakartaJstlApi = { group = "jakarta.servlet.jsp.jstl", name = "jakarta.servlet.jsp.jstl-api", version.ref = "jakartaJstlApiVersion" } +restlet = { group = "org.restlet.jse", name = "org.restlet", version.ref = "restletVersion" } +restletServlet = { group = "org.restlet.jee", name = "org.restlet.ext.servlet", version.ref = "restletVersion" } +restletJackson = { group = "org.restlet.jse", name = "org.restlet.ext.jackson", version.ref = "restletVersion" } +xbeanClassloader = { group = "org.apache.xbean", name = "xbean-classloader", version.ref = "xbeanClassloaderVersion" } +jgettext = { group = "org.fedorahosted.tennera", name = "jgettext", version.ref = "jgettextVersion" } +hamcrest = { group = "org.hamcrest", name = "hamcrest", version.ref = "hamcrestVersion" } +woodstoxCore = { group = "com.fasterxml.woodstox", name = "woodstox-core", version.ref = "woodstoxCoreVersion" } +keycloakSamlAdapterApiPublic = { group = "org.keycloak", name = "keycloak-saml-adapter-api-public", version.ref = "keycloakVersion" } +keycloakSamlServletFilterAdapter = { group = "org.keycloak", name = "keycloak-saml-servlet-filter-adapter", version.ref = "keycloakVersion" } +keycloakAdapterCore = { group = "org.keycloak", name = "keycloak-adapter-core", version.ref = "keycloakVersion" } +keycloakServletFilterAdapter = { group = "org.keycloak", name = "keycloak-servlet-filter-adapter", version.ref = "keycloakVersion" } +xmlsec = { group = "org.apache.santuario", name = "xmlsec", version.ref = "xmlsecVersion" } +bouncyCastleBcprov = { group = "org.bouncycastle", name = "bcprov-jdk18on", version.ref = "bouncyCastleVersion" } +bouncyCastleBcpkix = { group = "org.bouncycastle", name = "bcpkix-jdk18on", version.ref = "bouncyCastleVersion" } +bouncyCastleBcutil = { group = "org.bouncycastle", name = "bcutil-jdk18on", version.ref = "bouncyCastleVersion" } +spnego = { group = "org.codelibs", name = "spnego", version.ref = "spnegoVersion" } +owaspHtmlSanitizer = { group = "com.googlecode.owasp-java-html-sanitizer", name = "owasp-java-html-sanitizer", version.ref = "owaspHtmlSanitizerVersion" } + +# Test dependencies junit5api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit5Version" } +junit5params = { group = "org.junit.jupiter", name = "junit-jupiter-params", 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" +junit4 = { group = "junit", name = "junit", version.ref = "junit4Version" } springTest = { module = "org.springframework:spring-test", version.ref = "springVersion" } +awaitility = { group = "org.awaitility", name = "awaitility", version.ref = "awaitilityVersion" } +assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertjVersion" } +xmlunit = { group = "xmlunit", name = "xmlunit", version.ref = "xmlunitVersion" } +mockitoCore = { group = "org.mockito", name = "mockito-core", version.ref = "mockitoVersion" } +mockitoJunitJupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockitoVersion" } +jsonUnit = { group = "net.javacrumbs.json-unit", name = "json-unit", version.ref = "jsonUnitVersion" } +jsonUnitFluent = { group = "net.javacrumbs.json-unit", name = "json-unit-fluent", version.ref = "jsonUnitVersion" } +systemRules = { group = "com.github.stefanbirkner", name = "system-rules", version.ref = "systemRulesVersion" } +systemLambda = { group = "com.github.stefanbirkner", name = "system-lambda", version.ref = "systemLambdaVersion" } +concurrentUnit = { group = "net.jodah", name = "concurrentunit", version.ref = "concurrentUnitVersion" } +quickcheckCore = { group = "com.pholser", name = "junit-quickcheck-core", version.ref = "junitQuickCheck" } +quickcheckGenerators = { group = "com.pholser", name = "junit-quickcheck-generators", version.ref = "junitQuickCheck" } +jettyServer = { group = "org.eclipse.jetty", name = "jetty-server", version.ref = "jettyVersion" } +jettyServlet = { group = "org.eclipse.jetty", name = "jetty-servlet", version.ref = "jettyVersion" } +jettySecurity = { group = "org.eclipse.jetty", name = "jetty-security", version.ref = "jettyVersion" } +jbossLogging = { group = "org.jboss.logging", name = "jboss-logging", version.ref = "jbossLoggingVersion" } +commonsExec = { group = "org.apache.commons", name = "commons-exec", version.ref = "commonsExecVersion" } +jmockit = { group = "org.jmockit", name = "jmockit", version.ref = "jmockitVersion" } +jakartaInjectApi = { group = "jakarta.inject", name = "jakarta.inject-api", version = "1.0.5" } +mockServerJunit = { group = "org.mock-server", name = "mockserver-junit-rule-no-dependencies", version.ref = "mockServerJunitVersion" } [bundles] diff --git a/platform/platform-resources/build.gradle b/platform/platform-resources/build.gradle index 48f372970d8..ab20040719b 100644 --- a/platform/platform-resources/build.gradle +++ b/platform/platform-resources/build.gradle @@ -16,10 +16,10 @@ dependencies { api libs.slf4jApi api libs.commonsIO - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback } diff --git a/platform/platform-setup-test/build.gradle b/platform/platform-setup-test/build.gradle index 25b6d92d908..cef874d6b2d 100644 --- a/platform/platform-setup-test/build.gradle +++ b/platform/platform-setup-test/build.gradle @@ -2,7 +2,7 @@ dependencies { api libs.commonsLang - api "org.apache.commons:commons-exec:${Deps.commonsExecVersion}" + api libs.commonsExec } group = 'org.bonitasoft.platform' diff --git a/platform/platform-setup/build.gradle b/platform/platform-setup/build.gradle index c7f732f8d74..15e143f0d36 100644 --- a/platform/platform-setup/build.gradle +++ b/platform/platform-setup/build.gradle @@ -12,7 +12,7 @@ configurations { } dependencies { - api "org.apache.commons:commons-text:1.10.0" + api libs.commonsText api libs.slf4jApi api(libs.springBootStarter) { exclude(module: 'jul-to-slf4j') @@ -21,13 +21,13 @@ dependencies { } api libs.snakeyaml api libs.springBootStarterJdbc - api "org.postgresql:postgresql:${Deps.postgresqlVersion}" - api ("com.mysql:mysql-connector-j:${Deps.mysqlVersion}") { + api libs.postgresql + api(libs.mysql) { exclude(module: 'protobuf-java') } - api "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}" + api libs.msSqlServer api libs.h2 - api("com.oracle.database.jdbc:ojdbc8:${Deps.oracleVersion}") { + api(libs.oracle) { exclude(module: "ons") exclude(module: "oraclepki") exclude(module: "osdt_cert") @@ -39,15 +39,15 @@ dependencies { annotationProcessor libs.lombok compileOnly libs.lombok api(project(":platform:platform-resources")) - runtimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - 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}" + runtimeOnly libs.logback + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.systemRules testImplementation(libs.springBootStarterTest) { exclude(module: 'json-path') } - testImplementation "xmlunit:xmlunit:${Deps.xmlunitVersion}" + testImplementation libs.xmlunit testImplementation project(':platform:platform-setup-test') inDistrib project(path: ':platform:platform-resources', configuration: 'distributionZip') diff --git a/services/bonita-archive/build.gradle b/services/bonita-archive/build.gradle index 641889fa714..e7b4f791761 100644 --- a/services/bonita-archive/build.gradle +++ b/services/bonita-archive/build.gradle @@ -4,7 +4,7 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-transaction') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.logback } diff --git a/services/bonita-authentication/build.gradle b/services/bonita-authentication/build.gradle index e7c1c08583c..cdfaf3d3c09 100644 --- a/services/bonita-authentication/build.gradle +++ b/services/bonita-authentication/build.gradle @@ -3,6 +3,6 @@ dependencies { api project(':services:bonita-identity') api project(':services:bonita-commons') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore } diff --git a/services/bonita-authorization/build.gradle b/services/bonita-authorization/build.gradle index 4c31062b45c..53e14fef916 100644 --- a/services/bonita-authorization/build.gradle +++ b/services/bonita-authorization/build.gradle @@ -7,10 +7,10 @@ dependencies { api project(':bpm:bonita-core:bonita-home-server') api project(':bpm:bonita-common') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-business-application/build.gradle b/services/bonita-business-application/build.gradle index 97f869ebeaf..746cbd004cd 100644 --- a/services/bonita-business-application/build.gradle +++ b/services/bonita-business-application/build.gradle @@ -5,9 +5,9 @@ dependencies { api project(':services:bonita-events') api project(':services:bonita-log') api project(':services:bonita-builder') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-business-data/bonita-business-data-api/build.gradle b/services/bonita-business-data/bonita-business-data-api/build.gradle index 7f98acb6e34..826f7dcabcc 100644 --- a/services/bonita-business-data/bonita-business-data-api/build.gradle +++ b/services/bonita-business-data/bonita-business-data-api/build.gradle @@ -3,10 +3,10 @@ dependencies { api project(':services:bonita-commons') api libs.javassist - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback compileOnly project(':bpm:bonita-common') testImplementation project(':bpm:bonita-common') } diff --git a/services/bonita-business-data/bonita-business-data-client-resources/build.gradle b/services/bonita-business-data/bonita-business-data-client-resources/build.gradle index fbd6a93b5b7..d1a89c5bd02 100644 --- a/services/bonita-business-data/bonita-business-data-client-resources/build.gradle +++ b/services/bonita-business-data/bonita-business-data-client-resources/build.gradle @@ -9,9 +9,9 @@ dependencies { 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 libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj testImplementation(libs.hibernateCore) { exclude(module: 'jboss-transaction-api_1.2_spec') } 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 7d186388bc4..47c41462909 100644 --- a/services/bonita-business-data/bonita-business-data-generator/build.gradle +++ b/services/bonita-business-data/bonita-business-data-generator/build.gradle @@ -13,11 +13,11 @@ dependencies { api libs.javassist api project(':bpm:bonita-common') api libs.commonsLang - api "org.glassfish.jaxb:codemodel:${Deps.jaxbVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + api libs.jaxbCodeModel + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback testImplementation testFixtures(project(':bpm:bonita-common')) testImplementation project(':services:bonita-business-data:bonita-business-data-api') } 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 2ce6c4a3026..5e477c28af6 100644 --- a/services/bonita-business-data/bonita-business-data-impl/build.gradle +++ b/services/bonita-business-data/bonita-business-data-impl/build.gradle @@ -16,24 +16,24 @@ dependencies { annotationProcessor libs.lombok compileOnly libs.lombok - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "net.javacrumbs.json-unit:json-unit-fluent:${Deps.jsonUnitVersion}" - 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 libs.junit4 + testImplementation libs.assertj + testImplementation libs.jsonUnitFluent + testImplementation libs.mockitoCore + testImplementation libs.logback + testImplementation libs.narayanaJta testImplementation libs.springTest testImplementation libs.springJdbc testImplementation testFixtures(project(':bpm:bonita-common')) testRuntimeOnly libs.tomcatDbcp testRuntimeOnly libs.h2 - testRuntimeOnly "com.mysql:mysql-connector-j:${Deps.mysqlVersion}" - testRuntimeOnly "org.postgresql:postgresql:${Deps.postgresqlVersion}" - testRuntimeOnly "com.microsoft.sqlserver:mssql-jdbc:${Deps.mssqlVersion}" + testRuntimeOnly libs.mysql + testRuntimeOnly libs.postgresql + testRuntimeOnly libs.msSqlServer // Property Based Test framework: - testImplementation("com.pholser:junit-quickcheck-core:${Deps.junitQuickCheck}") - testImplementation("com.pholser:junit-quickcheck-generators:${Deps.junitQuickCheck}") + testImplementation(libs.quickcheckCore) + testImplementation(libs.quickcheckGenerators) } // run: diff --git a/services/bonita-cache/build.gradle b/services/bonita-cache/build.gradle index 734e2cac7e2..ee4e5997ce5 100644 --- a/services/bonita-cache/build.gradle +++ b/services/bonita-cache/build.gradle @@ -9,7 +9,7 @@ dependencies { annotationProcessor libs.lombok compileOnly libs.lombok - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.logback } diff --git a/services/bonita-classloader/build.gradle b/services/bonita-classloader/build.gradle index daf8000f71b..5713c52ebab 100644 --- a/services/bonita-classloader/build.gradle +++ b/services/bonita-classloader/build.gradle @@ -10,13 +10,13 @@ dependencies { api project(':services:bonita-log') api libs.commonsIO // Dependency on javax.annotations as it is not provided anymore in Java 11: - api("javax.annotation:javax.annotation-api:${Deps.javaxAnnotationsVersion}") + api(libs.javaxAnnotations) - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" + testImplementation libs.mockitoCore + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.logback + testImplementation libs.systemRules annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-command/build.gradle b/services/bonita-command/build.gradle index c069ef9341f..6b976b970b5 100644 --- a/services/bonita-command/build.gradle +++ b/services/bonita-command/build.gradle @@ -6,10 +6,10 @@ dependencies { api project(':services:bonita-builder') api project(':services:bonita-events') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-commons/build.gradle b/services/bonita-commons/build.gradle index 69e660f2a78..49708b6aad5 100644 --- a/services/bonita-commons/build.gradle +++ b/services/bonita-commons/build.gradle @@ -8,21 +8,20 @@ dependencies { api libs.jakartaActivation api libs.commonsLang api(libs.xstream) - api "io.micrometer:micrometer-core:${Deps.micrometerVersion}" + api libs.micrometerCore api libs.springContext api libs.springBootAutoconfigure api libs.slf4jApi - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.junit.jupiter:junit-jupiter-api:${Deps.junit5Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.mockito:mockito-junit-jupiter:${Deps.mockitoVersion}" - testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: Deps.junit5Version - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testImplementation "com.github.stefanbirkner:system-lambda:${Deps.systemLambdaVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: Deps.junit5Version - testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: Deps.junit5Version + testImplementation libs.junit4 + testImplementation libs.junit5api + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.mockitoJunitJupiter + testImplementation libs.systemRules + testImplementation libs.systemLambda + testImplementation libs.logback + testRuntimeOnly libs.junitJupiterEngine + testRuntimeOnly libs.junitVintageEngine annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-connector-executor/build.gradle b/services/bonita-connector-executor/build.gradle index 60cd940136d..edfc5419217 100644 --- a/services/bonita-connector-executor/build.gradle +++ b/services/bonita-connector-executor/build.gradle @@ -3,14 +3,14 @@ plugins { } dependencies { - runtimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + runtimeOnly libs.logback api project(':services:bonita-commons') api project(':services:bonita-time-tracker') api project(':services:bonita-session') - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.junit4 + testImplementation libs.systemRules annotationProcessor libs.lombok compileOnly libs.lombok } diff --git a/services/bonita-data-instance/build.gradle b/services/bonita-data-instance/build.gradle index 6ab6bace7f8..1b9d96b5bcc 100644 --- a/services/bonita-data-instance/build.gradle +++ b/services/bonita-data-instance/build.gradle @@ -9,11 +9,11 @@ dependencies { api project(':services:bonita-events') api project(':services:bonita-log') api project(':services:bonita-archive') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback + testImplementation libs.systemRules annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-events/build.gradle b/services/bonita-events/build.gradle index ad6dd76f7d9..5adbfe16cf6 100644 --- a/services/bonita-events/build.gradle +++ b/services/bonita-events/build.gradle @@ -2,9 +2,9 @@ dependencies { api project(':services:bonita-commons') - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.mockitoCore + testImplementation libs.junit4 + testImplementation libs.logback } tasks.register("testsJar", Jar) { diff --git a/services/bonita-expression/build.gradle b/services/bonita-expression/build.gradle index 7877fd511b6..92721bd6850 100644 --- a/services/bonita-expression/build.gradle +++ b/services/bonita-expression/build.gradle @@ -9,8 +9,8 @@ dependencies { compileOnly libs.lombok api libs.bundles.groovy api libs.commonsLang - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" + testImplementation libs.junit4 + testImplementation libs.logback + testImplementation libs.mockitoCore + testImplementation libs.assertj } diff --git a/services/bonita-identity/build.gradle b/services/bonita-identity/build.gradle index c76d0b8b8bc..e7c91beb2ad 100644 --- a/services/bonita-identity/build.gradle +++ b/services/bonita-identity/build.gradle @@ -8,9 +8,9 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-events') api libs.jakartaActivation - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-incident/build.gradle b/services/bonita-incident/build.gradle index 1968588c542..bad6767d7da 100644 --- a/services/bonita-incident/build.gradle +++ b/services/bonita-incident/build.gradle @@ -1,9 +1,9 @@ dependencies { api project(':bpm:bonita-common') api project(':bpm:bonita-core:bonita-home-server') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.systemRules + testRuntimeOnly libs.logback + testImplementation libs.assertj } diff --git a/services/bonita-lock/build.gradle b/services/bonita-lock/build.gradle index 731f21b019b..324a1f2a0c8 100644 --- a/services/bonita-lock/build.gradle +++ b/services/bonita-lock/build.gradle @@ -3,7 +3,7 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-session') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.logback } diff --git a/services/bonita-log/build.gradle b/services/bonita-log/build.gradle index 0ffc3a71802..c2c9225c483 100644 --- a/services/bonita-log/build.gradle +++ b/services/bonita-log/build.gradle @@ -7,10 +7,10 @@ dependencies { api project(':services:bonita-builder') api project(':services:bonita-platform') api project(':services:bonita-transaction') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-page/build.gradle b/services/bonita-page/build.gradle index 7bdeb808435..1a567ca13f9 100644 --- a/services/bonita-page/build.gradle +++ b/services/bonita-page/build.gradle @@ -7,10 +7,10 @@ dependencies { api project(':services:bonita-authorization') api project(':bpm:bonita-common') - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.junit4 + testImplementation libs.logback testImplementation testFixtures(project(':bpm:bonita-common')) annotationProcessor libs.lombok diff --git a/services/bonita-persistence/build.gradle b/services/bonita-persistence/build.gradle index ddc068feb65..3e39adfc1cb 100644 --- a/services/bonita-persistence/build.gradle +++ b/services/bonita-persistence/build.gradle @@ -14,16 +14,16 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-lock') 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}" + implementation(libs.javaxAnnotations) + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj compileOnly libs.jakartaTransactionApi annotationProcessor libs.lombok compileOnly libs.lombok - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" + testRuntimeOnly libs.logback + testImplementation libs.systemRules testAnnotationProcessor libs.lombok testImplementation libs.lombok } diff --git a/services/bonita-platform-authentication/build.gradle b/services/bonita-platform-authentication/build.gradle index 2bc03258b54..ce90d36d0ab 100644 --- a/services/bonita-platform-authentication/build.gradle +++ b/services/bonita-platform-authentication/build.gradle @@ -2,7 +2,7 @@ dependencies { api project(':services:bonita-commons') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.logback } diff --git a/services/bonita-platform-command/build.gradle b/services/bonita-platform-command/build.gradle index 4a4e511983b..e3d86472012 100644 --- a/services/bonita-platform-command/build.gradle +++ b/services/bonita-platform-command/build.gradle @@ -4,9 +4,9 @@ dependencies { api project(':services:bonita-log') api project(':services:bonita-commons') api project(':services:bonita-persistence') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-platform/build.gradle b/services/bonita-platform/build.gradle index 96cd0380720..cebab73d134 100644 --- a/services/bonita-platform/build.gradle +++ b/services/bonita-platform/build.gradle @@ -6,10 +6,10 @@ dependencies { api project(':services:bonita-persistence') api project(':services:bonita-commons') testImplementation project(':services:bonita-events') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-profile/build.gradle b/services/bonita-profile/build.gradle index 8ef2282ea9e..b98a44a2eab 100644 --- a/services/bonita-profile/build.gradle +++ b/services/bonita-profile/build.gradle @@ -8,8 +8,8 @@ dependencies { api project(':services:bonita-events') api project(':services:bonita-builder') api project(':services:bonita-identity') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-resources/build.gradle b/services/bonita-resources/build.gradle index dab2b948367..3a9e2721ab0 100644 --- a/services/bonita-resources/build.gradle +++ b/services/bonita-resources/build.gradle @@ -3,11 +3,11 @@ dependencies { api project(':services:bonita-persistence') api project(':services:bonita-commons') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.systemRules + testImplementation libs.assertj + testRuntimeOnly libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-scheduler/build.gradle b/services/bonita-scheduler/build.gradle index bf23ca6be3d..7e0871c8110 100644 --- a/services/bonita-scheduler/build.gradle +++ b/services/bonita-scheduler/build.gradle @@ -7,16 +7,16 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-transaction') api project(':services:bonita-incident') - api("org.quartz-scheduler:quartz:${Deps.quartzVersion}") { + api(libs.quartz) { exclude(group: "com.mchange") // c3p0 + transitive dep mchange-commons-java, because we do not use // default Quartz connection provider, as we have our own exclude(module: "HikariCP-java7") // Same reason } - api "io.micrometer:micrometer-core:${Deps.micrometerVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + api libs.micrometerCore + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-session/build.gradle b/services/bonita-session/build.gradle index 162b3916a3f..2d8203bf4b9 100644 --- a/services/bonita-session/build.gradle +++ b/services/bonita-session/build.gradle @@ -3,10 +3,10 @@ dependencies { api project(':services:bonita-commons') api project(':services:bonita-builder') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-temporary-content/build.gradle b/services/bonita-temporary-content/build.gradle index dab2b948367..3a9e2721ab0 100644 --- a/services/bonita-temporary-content/build.gradle +++ b/services/bonita-temporary-content/build.gradle @@ -3,11 +3,11 @@ dependencies { api project(':services:bonita-persistence') api project(':services:bonita-commons') - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.systemRules + testImplementation libs.assertj + testRuntimeOnly libs.logback annotationProcessor libs.lombok compileOnly libs.lombok diff --git a/services/bonita-time-tracker/build.gradle b/services/bonita-time-tracker/build.gradle index 04c73a1129e..91c56f33d2d 100644 --- a/services/bonita-time-tracker/build.gradle +++ b/services/bonita-time-tracker/build.gradle @@ -3,10 +3,10 @@ dependencies { api project(':services:bonita-commons') api libs.commonsCollections - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.mockitoCore + testImplementation libs.assertj + testImplementation libs.logback } description = 'Bonita Time Tracker' diff --git a/services/bonita-transaction/build.gradle b/services/bonita-transaction/build.gradle index 7349fc47bc2..29b82b85eef 100644 --- a/services/bonita-transaction/build.gradle +++ b/services/bonita-transaction/build.gradle @@ -5,10 +5,10 @@ dependencies { annotationProcessor libs.lombok compileOnly libs.lombok - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.jboss.narayana.jta:narayana-jta:${Deps.narayanaVersion}" - testImplementation "org.jboss.logging:jboss-logging:${Deps.jbossLoggingVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.mockitoCore + testImplementation libs.junit4 + testImplementation libs.assertj + testImplementation libs.narayanaJta + testImplementation libs.jbossLogging + testRuntimeOnly libs.logback } diff --git a/services/bonita-work/build.gradle b/services/bonita-work/build.gradle index a1e7f6bb8af..a1e4536403d 100644 --- a/services/bonita-work/build.gradle +++ b/services/bonita-work/build.gradle @@ -7,10 +7,10 @@ dependencies { api project(':services:bonita-transaction') api libs.springJdbc api libs.springContext - testImplementation "junit:junit:${Deps.junit4Version}" - testImplementation "org.awaitility:awaitility:${Deps.awaitilityVersion}" - testImplementation "org.assertj:assertj-core:${Deps.assertjVersion}" - testImplementation "org.mockito:mockito-core:${Deps.mockitoVersion}" - testImplementation "com.github.stefanbirkner:system-rules:${Deps.systemRulesVersion}" - testRuntimeOnly "ch.qos.logback:logback-classic:${Deps.logbackVersion}" + testImplementation libs.junit4 + testImplementation libs.awaitility + testImplementation libs.assertj + testImplementation libs.mockitoCore + testImplementation libs.systemRules + testRuntimeOnly libs.logback }