Merge branch 'main' into java-in-jshell-out

sormuras · sormuras · commit 9c08f8f7d8b1 · 2025-06-25T10:53:10.000+02:00
# Conflicts:
#	.github/workflows/build-all-examples.yml
#	junit-modular-world/compile.jsh
diff --git a/.github/workflows/build-all-examples.yml b/.github/workflows/build-all-examples.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           java-version: 24
           distribution: temurin
-      - uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
+      - uses: sbt/setup-sbt@a9d38be6cfa0c7bfb8be93b4cc4e1edaa6351728 # v1.1.10
       - name: 'Build all examples'
         run: java src/Builder.java
       - name: 'Check automation for updating versions'
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -30,7 +30,7 @@ jobs:
         with:
           java-version: 24
           distribution: temurin
-      - uses: sbt/setup-sbt@6c68d2fe8dfbc0a0534d70101baa2e0420e1a506 # v1.1.9
+      - uses: sbt/setup-sbt@a9d38be6cfa0c7bfb8be93b4cc4e1edaa6351728 # v1.1.10
       - name: Initialize CodeQL
         uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
diff --git a/junit-jupiter-extensions/build.gradle b/junit-jupiter-extensions/build.gradle
@@ -17,7 +17,7 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 dependencies {
-	api(platform("org.junit:junit-bom:5.13.1"))
+	api(platform("org.junit:junit-bom:5.13.2"))
 	api("org.junit.jupiter:junit-jupiter-api") {
         because 'building extensions in "main" using JUnit Jupiter API'
     }
diff --git a/junit-jupiter-starter-ant/build.sh b/junit-jupiter-starter-ant/build.sh
@@ -4,7 +4,7 @@ set -e
 #
 # Set constants.
 #
-junit_platform_version='1.13.1'
+junit_platform_version='1.13.2'
 ant_version='1.10.13'
 ant_folder="apache-ant-${ant_version}"
 ant_archive="${ant_folder}-bin.tar.gz"
diff --git a/junit-jupiter-starter-bazel/MODULE.bazel b/junit-jupiter-starter-bazel/MODULE.bazel
@@ -1,6 +1,6 @@
-JUNIT_JUPITER_VERSION = "5.13.1"
+JUNIT_JUPITER_VERSION = "5.13.2"
 
-JUNIT_PLATFORM_VERSION = "1.13.1"
+JUNIT_PLATFORM_VERSION = "1.13.2"
 
 bazel_dep(name = "rules_jvm_external", version = "6.7")
 bazel_dep(name = "contrib_rules_jvm", version = "0.29.0")
diff --git a/junit-jupiter-starter-bazel/MODULE.bazel.lock b/junit-jupiter-starter-bazel/MODULE.bazel.lock
diff --git a/junit-jupiter-starter-gradle-groovy/build.gradle b/junit-jupiter-starter-gradle-groovy/build.gradle
@@ -10,7 +10,7 @@ repositories {
 
 dependencies {
 	implementation(localGroovy())
-	testImplementation(platform('org.junit:junit-bom:5.13.1'))
+	testImplementation(platform('org.junit:junit-bom:5.13.2'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
 	testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 }
diff --git a/junit-jupiter-starter-gradle-kotlin/build.gradle.kts b/junit-jupiter-starter-gradle-kotlin/build.gradle.kts
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation(platform("org.junit:junit-bom:5.13.1"))
+	testImplementation(platform("org.junit:junit-bom:5.13.2"))
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
diff --git a/junit-jupiter-starter-gradle/build.gradle b/junit-jupiter-starter-gradle/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation(platform('org.junit:junit-bom:5.13.1'))
+	testImplementation(platform('org.junit:junit-bom:5.13.2'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
 	testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 }
diff --git a/junit-jupiter-starter-maven-kotlin/pom.xml b/junit-jupiter-starter-maven-kotlin/pom.xml
@@ -20,7 +20,7 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
-				<version>5.13.1</version>
+				<version>5.13.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/junit-jupiter-starter-maven/pom.xml b/junit-jupiter-starter-maven/pom.xml
@@ -18,7 +18,7 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
-				<version>5.13.1</version>
+				<version>5.13.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/junit-jupiter-starter-sbt/build.sbt b/junit-jupiter-starter-sbt/build.sbt
@@ -8,8 +8,8 @@ lazy val root = project
     name := "junit-jupiter-starter-sbt",
     libraryDependencies ++= Seq(
       "net.aichler" % "jupiter-interface" % JupiterKeys.jupiterVersion.value % Test,
-      "org.junit.jupiter" % "junit-jupiter" % "5.13.1" % Test,
-      "org.junit.platform" % "junit-platform-launcher" % "1.13.1" % Test,
+      "org.junit.jupiter" % "junit-jupiter" % "5.13.2" % Test,
+      "org.junit.platform" % "junit-platform-launcher" % "1.13.2" % Test,
     ),
     testOptions += Tests.Argument(jupiterTestFramework, "--display-mode=tree")
   )
diff --git a/junit-migration-gradle/README.md b/junit-migration-gradle/README.md
@@ -60,7 +60,7 @@ Jupiter TestEngine.
 
 ```groovy
 dependencies {
-	testImplementation("org.junit.jupiter:junit-jupiter:5.13.1")
+	testImplementation("org.junit.jupiter:junit-jupiter:5.13.2")
 }
 ```
 
@@ -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.13.1")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.13.2")
 }
 ```
 
diff --git a/junit-migration-gradle/build.gradle b/junit-migration-gradle/build.gradle
@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation(platform("org.junit:junit-bom:5.13.1"))
+	testImplementation(platform("org.junit:junit-bom:5.13.2"))
 
 	testImplementation("org.junit.jupiter:junit-jupiter") {
 		because 'allows to write and run Jupiter tests'
diff --git a/junit-migration-maven/pom.xml b/junit-migration-maven/pom.xml
@@ -19,7 +19,7 @@
 			<dependency>
 				<groupId>org.junit</groupId>
 				<artifactId>junit-bom</artifactId>
-				<version>5.13.1</version>
+				<version>5.13.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/junit-multiple-engines/build.gradle.kts b/junit-multiple-engines/build.gradle.kts
@@ -15,7 +15,7 @@ repositories {
 
 dependencies {
     val junit4Version = "4.13.2"
-    val junitBomVersion = "5.13.1"
+    val junitBomVersion = "5.13.2"
 
     // Use junit-bom to align versions
     // https://docs.gradle.org/current/userguide/managing_transitive_dependencies.html#sec:bom_import

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.13.1"))`
	`20`	`+ api(platform("org.junit:junit-bom:5.13.2"))`
`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.13.1'`
	`7`	`+junit_platform_version='1.13.2'`
`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.13.1'))`
	`13`	`+ testImplementation(platform('org.junit:junit-bom:5.13.2'))`
`14`	`14`	`testImplementation('org.junit.jupiter:junit-jupiter')`
`15`	`15`	`testRuntimeOnly('org.junit.platform:junit-platform-launcher')`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ repositories {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`dependencies {`
`12`		`- testImplementation(platform('org.junit:junit-bom:5.13.1'))`
	`12`	`+ testImplementation(platform('org.junit:junit-bom:5.13.2'))`
`13`	`13`	`testImplementation('org.junit.jupiter:junit-jupiter')`
`14`	`14`	`testRuntimeOnly('org.junit.platform:junit-platform-launcher')`
`15`	`15`	`}`