Merge branch 'main' into sormuras/maven-4

sormuras · web-flow · commit b4c043708f8b · 2025-06-10T10:52:32.000+02:00
diff --git a/.github/workflows/build-all-samples.yml b/.github/workflows/build-all-samples.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           java-version: 21
           distribution: temurin
-      - uses: sbt/setup-sbt@69a46ab4acd4316aa16e68d91a9249a98d7e78d5 # v1.1.8
+      - uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
       - name: 'Build all samples using JShell'
         run: java src/Builder.java
       - name: 'Check automation for updating versions'
diff --git a/.github/workflows/nohttp.yml b/.github/workflows/nohttp.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: 'Run nohttp'
-        uses: jbangdev/jbang-action@ad9de817ea5f3612cf6f32d82249bc5443191818 # v0.126.1
+        uses: jbangdev/jbang-action@acb7292ee1e73bf778db2bbc2b52620627a635a5 # v0.126.2
         with:
           script: io.spring.nohttp:nohttp-cli:0.0.9
           scriptargs: "-D=\\.git -D=build -D=target -D=apache-ant-.+ -F=maven-wrapper\\.properties -F=mvnw\\.cmd -Fmvnw -FMODULE.bazel.lock"
diff --git a/junit5-jupiter-extensions/build.gradle b/junit5-jupiter-extensions/build.gradle
@@ -17,7 +17,7 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 dependencies {
-	api(platform("org.junit:junit-bom:5.12.2"))
+	api(platform("org.junit:junit-bom:5.13.1"))
 	api("org.junit.jupiter:junit-jupiter-api") {
         because 'building extensions in "main" using JUnit Jupiter API'
     }
diff --git a/junit5-jupiter-extensions/gradle/wrapper/gradle-wrapper.properties b/junit5-jupiter-extensions/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/junit5-jupiter-starter-ant/build.sh b/junit5-jupiter-starter-ant/build.sh
@@ -4,7 +4,7 @@ set -e
 #
 # Set constants.
 #
-junit_platform_version='1.12.2'
+junit_platform_version='1.13.1'
 ant_version='1.10.13'
 ant_folder="apache-ant-${ant_version}"
 ant_archive="${ant_folder}-bin.tar.gz"
diff --git a/junit5-jupiter-starter-bazel/MODULE.bazel b/junit5-jupiter-starter-bazel/MODULE.bazel
@@ -1,9 +1,9 @@
-JUNIT_JUPITER_VERSION = "5.12.2"
+JUNIT_JUPITER_VERSION = "5.13.1"
 
-JUNIT_PLATFORM_VERSION = "1.12.2"
+JUNIT_PLATFORM_VERSION = "1.13.1"
 
 bazel_dep(name = "rules_jvm_external", version = "6.7")
-bazel_dep(name = "contrib_rules_jvm", version = "0.28.0")
+bazel_dep(name = "contrib_rules_jvm", version = "0.29.0")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 
diff --git a/junit5-jupiter-starter-bazel/MODULE.bazel.lock b/junit5-jupiter-starter-bazel/MODULE.bazel.lock
diff --git a/junit5-jupiter-starter-gradle-groovy/build.gradle b/junit5-jupiter-starter-gradle-groovy/build.gradle
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
 	implementation(localGroovy())
-	testImplementation(platform('org.junit:junit-bom:5.12.2'))
+	testImplementation(platform('org.junit:junit-bom:5.13.1'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
 	testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 }
diff --git a/junit5-jupiter-starter-gradle-groovy/gradle/wrapper/gradle-wrapper.properties b/junit5-jupiter-starter-gradle-groovy/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/junit5-jupiter-starter-gradle-kotlin/build.gradle.kts b/junit5-jupiter-starter-gradle-kotlin/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation(platform("org.junit:junit-bom:5.12.2"))
+	testImplementation(platform("org.junit:junit-bom:5.13.1"))
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/junit5-jupiter-starter-gradle-kotlin/gradle/wrapper/gradle-wrapper.properties b/junit5-jupiter-starter-gradle-kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/junit5-jupiter-starter-gradle/build.gradle b/junit5-jupiter-starter-gradle/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation(platform('org.junit:junit-bom:5.12.2'))
+	testImplementation(platform('org.junit:junit-bom:5.13.1'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
 	testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 }
diff --git a/junit5-jupiter-starter-gradle/gradle/wrapper/gradle-wrapper.properties b/junit5-jupiter-starter-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/junit5-jupiter-starter-maven-kotlin/pom.xml b/junit5-jupiter-starter-maven-kotlin/pom.xml
@@ -19,7 +19,7 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
-				<version>5.12.2</version>
+				<version>5.13.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/junit5-jupiter-starter-maven/pom.xml b/junit5-jupiter-starter-maven/pom.xml
@@ -17,7 +17,7 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
-				<version>5.12.2</version>
+				<version>5.13.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/junit5-jupiter-starter-sbt/build.sbt b/junit5-jupiter-starter-sbt/build.sbt
@@ -1,5 +1,5 @@
 ThisBuild / organization := "com.example"
-ThisBuild / scalaVersion := "3.7.0"
+ThisBuild / scalaVersion := "3.7.1"
 ThisBuild / version := "0.1.0-SNAPSHOT"
 
 lazy val root = project
@@ -8,8 +8,8 @@ lazy val root = project
     name := "junit5-jupiter-starter-sbt",
     libraryDependencies ++= Seq(
       "net.aichler" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test,
-      "org.junit.jupiter" % "junit-jupiter" % "5.12.2" % Test,
-      "org.junit.platform" % "junit-platform-launcher" % "1.12.2" % Test,
+      "org.junit.jupiter" % "junit-jupiter" % "5.13.1" % Test,
+      "org.junit.platform" % "junit-platform-launcher" % "1.13.1" % Test,
     ),
     testOptions += Tests.Argument(jupiterTestFramework, "--display-mode=tree")
   )
diff --git a/junit5-jupiter-starter-sbt/project/build.properties b/junit5-jupiter-starter-sbt/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.0
+sbt.version=1.11.2
diff --git a/junit5-migration-gradle/README.md b/junit5-migration-gradle/README.md
@@ -60,7 +60,7 @@ Jupiter TestEngine.
 
 ```groovy
 dependencies {
-	testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.13.1")
 }
 ```
 
@@ -71,7 +71,7 @@ on the JUnit Vintage TestEngine implementation similar to the following.
 ```groovy
 dependencies {
 	testImplementation("junit:junit:4.13.2")
-	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.12.2")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.13.1")
 }
 ```
 
diff --git a/junit5-migration-gradle/build.gradle b/junit5-migration-gradle/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation(platform("org.junit:junit-bom:5.12.2"))
+	testImplementation(platform("org.junit:junit-bom:5.13.1"))
 
 	testImplementation("org.junit.jupiter:junit-jupiter") {
 		because 'allows to write and run Jupiter tests'
diff --git a/junit5-migration-gradle/gradle/wrapper/gradle-wrapper.properties b/junit5-migration-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/junit5-migration-maven/pom.xml b/junit5-migration-maven/pom.xml
@@ -18,7 +18,7 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
-				<version>5.12.2</version>
+				<version>5.13.1</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/junit5-modular-world/compile.jsh b/junit5-modular-world/compile.jsh
@@ -5,9 +5,9 @@
 //
 // download main and test dependencies
 //
-String platformVersion = "1.12.2"
-String jupiterVersion = "5.12.2"
-String vintageVersion = "5.12.2"
+String platformVersion = "1.13.1"
+String jupiterVersion = "5.13.1"
+String vintageVersion = "5.13.1"
 get("lib", "org.junit.platform", "junit-platform-commons", platformVersion)
 get("lib", "org.junit.platform", "junit-platform-console", platformVersion)
 get("lib", "org.junit.platform", "junit-platform-engine", platformVersion)
diff --git a/junit5-multiple-engines/build.gradle.kts b/junit5-multiple-engines/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     val junit4Version = "4.13.2"
-    val junitBomVersion = "5.12.2"
+    val junitBomVersion = "5.13.1"
 
     // Use junit-bom to align versions
     // https://docs.gradle.org/current/userguide/managing_transitive_dependencies.html#sec:bom_import
@@ -49,7 +49,7 @@ dependencies {
     }
 
     // jqwik
-    testImplementation("net.jqwik:jqwik:1.9.2") {
+    testImplementation("net.jqwik:jqwik:1.9.3") {
         because("allows jqwik properties to run")
     }
 
diff --git a/junit5-multiple-engines/gradle/wrapper/gradle-wrapper.properties b/junit5-multiple-engines/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ tasks.withType(JavaCompile).configureEach {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`dependencies {`
`20`		`- api(platform("org.junit:junit-bom:5.12.2"))`
	`20`	`+ api(platform("org.junit:junit-bom:5.13.1"))`
`21`	`21`	`api("org.junit.jupiter:junit-jupiter-api") {`
`22`	`22`	`because 'building extensions in "main" using JUnit Jupiter API'`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ set -e`
`4`	`4`	`#`
`5`	`5`	`# Set constants.`
`6`	`6`	`#`
`7`		`-junit_platform_version='1.12.2'`
	`7`	`+junit_platform_version='1.13.1'`
`8`	`8`	`ant_version='1.10.13'`
`9`	`9`	`ant_folder="apache-ant-${ant_version}"`
`10`	`10`	`ant_archive="${ant_folder}-bin.tar.gz"`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ repositories {`
`10`	`10`
`11`	`11`	`dependencies {`
`12`	`12`	`implementation(localGroovy())`
`13`		`- testImplementation(platform('org.junit:junit-bom:5.12.2'))`
	`13`	`+ testImplementation(platform('org.junit:junit-bom:5.13.1'))`
`14`	`14`	`testImplementation('org.junit.jupiter:junit-jupiter')`
`15`	`15`	`testRuntimeOnly('org.junit.platform:junit-platform-launcher')`
`16`	`16`	`}`