diff --git a/build.gradle b/build.gradle index a9f811243528..652acb27421e 100644 --- a/build.gradle +++ b/build.gradle @@ -345,7 +345,6 @@ dependencies { // use newest version of commons-compress to avoid security issues through outdated dependencies implementation "org.apache.commons:commons-compress:1.27.1" - // import JHipster dependencies BOM implementation platform("tech.jhipster:jhipster-dependencies:${jhipster_dependencies_version}") @@ -377,7 +376,7 @@ dependencies { implementation "javax.cache:cache-api:1.1.1" implementation "org.hibernate.orm:hibernate-core:${hibernate_version}" - implementation "com.zaxxer:HikariCP:6.1.0" + implementation "com.zaxxer:HikariCP:6.2.1" implementation "org.apache.commons:commons-text:1.12.0" implementation "org.apache.commons:commons-math3:3.6.1" @@ -414,8 +413,13 @@ dependencies { implementation "org.springframework.cloud:spring-cloud-starter-config:4.1.3" implementation "org.springframework.cloud:spring-cloud-commons:4.1.4" - implementation "io.netty:netty-all:4.1.115.Final" implementation "io.projectreactor.netty:reactor-netty:1.2.0" + implementation("io.netty:netty-common") { + version { + strictly netty_version + } + } + implementation "org.springframework:spring-messaging:6.1.14" implementation "org.springframework.retry:spring-retry:2.0.10" @@ -546,6 +550,14 @@ dependencies { exclude group: "org.testcontainers", module: "mariadb" exclude group: "org.testcontainers", module: "mssqlserver" } + testImplementation "org.testcontainers:testcontainers:1.20.3" + testImplementation "org.testcontainers:mysql:1.20.3" + testImplementation "org.testcontainers:postgresql:1.20.3" + testImplementation "org.testcontainers:testcontainers:1.20.3" + testImplementation "org.testcontainers:junit-jupiter:1.20.3" + testImplementation "org.testcontainers:jdbc:1.20.3" + testImplementation "org.testcontainers:database-commons:1.20.3" + testImplementation "com.tngtech.archunit:archunit:1.3.0" testImplementation("org.skyscreamer:jsonassert:1.5.3") { exclude module: "android-json" @@ -597,7 +609,7 @@ tasks.withType(Test).configureEach { afterTest { descriptor, result -> if (result.resultType == TestResult.ResultType.FAILURE) { - String failedTest = "${descriptor.className}::${descriptor.name}" + var failedTest = "${descriptor.className}::${descriptor.name}" logger.debug("Adding " + failedTest + " to failedTests...") failedTests << [failedTest] } diff --git a/gradle.properties b/gradle.properties index 2f2ade9049ba..49a2586270bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,10 +31,11 @@ docker_java_version=3.4.0 logback_version=1.5.12 java_parser_version=3.26.2 byte_buddy_version=1.15.10 +netty_version=4.1.115.Final # testing # make sure both versions are compatible -junit_version=5.11.0 +junit_version=5.11.3 junit_platform_version=1.11.3 mockito_version=5.14.2