Skip to content

Update to Gradle 8.13 and JUnit 5.12.0 #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reta merged 1 commit into from
Mar 13, 2025
Merged

Update to Gradle 8.13 and JUnit 5.12.0 #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions buildSrc/src/main/kotlin/java-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ if (!buildVersion.equals(tagVersion)) {

version = buildVersion
java.sourceCompatibility = JavaVersion.VERSION_17

versionCatalogs
.named("libs")
.findLibrary("jupiter")
Expand All @@ -56,6 +56,15 @@ versionCatalogs
testImplementation(jupiter)
}
}

versionCatalogs
Copy link
Copy Markdown
Member

@dlvenable dlvenable Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious why we need this.

Copy link
Copy Markdown
Collaborator Author

@reta reta Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gradle Kotlin has horrible support for version catalogs in build scripts :( JUnit 5.12.0 needs junit-platform-launcher

.named("libs")
.findLibrary("junit-platform-launcher")
.ifPresent { junitPlatformLauncher ->
dependencies {
testRuntimeOnly(junitPlatformLauncher)
}
}

versionCatalogs
.named("libs")
Expand All @@ -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 {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
Loading