diff --git a/buildSrc/src/main/kotlin/java-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-conventions.gradle.kts index ae663585..b2d13caf 100644 --- a/buildSrc/src/main/kotlin/java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/java-conventions.gradle.kts @@ -47,7 +47,7 @@ if (!buildVersion.equals(tagVersion)) { version = buildVersion java.sourceCompatibility = JavaVersion.VERSION_17 - + versionCatalogs .named("libs") .findLibrary("jupiter") @@ -56,6 +56,15 @@ versionCatalogs testImplementation(jupiter) } } + +versionCatalogs + .named("libs") + .findLibrary("junit-platform-launcher") + .ifPresent { junitPlatformLauncher -> + dependencies { + testRuntimeOnly(junitPlatformLauncher) + } + } versionCatalogs .named("libs") @@ -71,7 +80,7 @@ dependencies { testImplementation("org.testcontainers:junit-jupiter:1.20.5") testImplementation("org.mockito:mockito-junit-jupiter:5.15.2") testImplementation("org.assertj:assertj-core:3.27.3") - testImplementation("ch.qos.logback:logback-classic:1.5.16") + testImplementation("ch.qos.logback:logback-classic:1.5.17") } java { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..9bbc975c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5ce18b15..a0b98c55 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 +distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 diff --git a/gradlew b/gradlew index f5feea6d..faf93008 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/settings.gradle.kts b/settings.gradle.kts index c73b62d4..af99857a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,9 +8,11 @@ rootProject.name = "spring-data-opensearch-parent" dependencyResolutionManagement { versionCatalogs { create("libs") { - version("jupiter", "5.11.4") + version("jupiter", "5.12.0") + version("launcher", "1.12.0") library("jupiter", "org.junit.jupiter", "junit-jupiter").versionRef("jupiter") library("jupiter-params", "org.junit.jupiter", "junit-jupiter-params").versionRef("jupiter") + library("junit-platform-launcher", "org.junit.platform", "junit-platform-launcher").versionRef("launcher") } create("springLibs") {