Add junit6-integration test project

This shall ensure the execution with JUnit 6 is possible.

Author: AndreasTu

.github/renovate.json5

@@ -20,6 +20,16 @@
       matchCurrentValue: "/^4\\./",
       allowedVersions: "(,5.0)"
     },
+    {
+      matchPackageNames: ["/^org.junit:/"],
+      matchCurrentValue: "/^5\\./",
+      allowedVersions: "(,6.0)"
+    },
+    {
+      matchPackageNames: ["/^org.junit:/"],
+      matchCurrentValue: "/^6\\./",
+      allowedVersions: "(,7.0)"
+    },
     {
       matchPackageNames: ["/^org.mockito:/"],
       matchCurrentValue: "/^4\\./",

build.gradle

@@ -157,7 +157,9 @@ subprojects {
   dependencies {
     api platform(projects.spockBom)
     implementation(project.name == "spock-gradle" ? [] : groovylibs.groovy)
-    testImplementation(platform(libs.junit.bom))
+    if (project.name != "junit6-integration") {
+      testImplementation(platform(libs.junit5.bom))
+    }
     testImplementation(libs.junit.platform.launcher)
   }
 

gradle/libs.versions.toml

@@ -4,7 +4,8 @@ groovy2 = '2.5.23'
 groovy3 = '3.0.25'
 groovy4 = '4.0.29'
 jacoco = '0.8.14'
-junit = '5.14.0'
+junit5 = '5.14.0'
+junit6 = '6.0.0'
 # The VersionRange used by OSGi to check compatibility with JUnit Platform.
 junitPlatformVersionRange = "[1.12,7)"
 asm = '9.9'
@@ -31,7 +32,8 @@ mockito5 = { module = "org.mockito:mockito-core", version.ref = "mockito5" }
 objenesis = "org.objenesis:objenesis:3.4"
 # This needs a classifier, but it has to be specified on the usage end https://melix.github.io/blog/2021/03/version-catalogs-faq.html#_why_can_t_i_use_excludes_or_classifiers
 jacoco-agent = { module = "org.jacoco:org.jacoco.agent", version.ref = "jacoco" }
-junit-bom =  { module = "org.junit:junit-bom",  version.ref = "junit" }
+junit5-bom =  { module = "org.junit:junit-bom",  version.ref = "junit5" }
+junit6-bom =  { module = "org.junit:junit-bom",  version.ref = "junit6" }
 # to omit the version we have to use this syntax, the version is managed by the junit-bom
 junit-jupiter.module = "org.junit.jupiter:junit-jupiter"
 junit-platform-console.module = "org.junit.platform:junit-platform-console"

settings.gradle

@@ -119,6 +119,12 @@ if (javaVersion <= 17) {
 include "spock-spring:spring3-test"
 include "spock-spring:spring5-test"
 
+
+if (javaVersion >= 17) {
+  //JUnit 6 only works for Java 17 and newer
+  include "spock-specs:junit6-integration"
+}
+
 rootProject.name = "spock"
 nameBuildScriptsAfterProjectNames(rootProject.children)
 

spock-core/core.gradle

@@ -22,7 +22,7 @@ configurations {
 
 dependencies {
   api groovylibs.groovy // easiest way to add Groovy dependency to POM
-  api platform(libs.junit.bom)
+  api platform(libs.junit5.bom)
   api 'org.junit.platform:junit-platform-engine'
   api libs.hamcrest
   if (variant == 2.5) {

spock-specs/junit6-integration/junit6-integration.gradle

@@ -0,0 +1,9 @@
+ext.displayName = "Spock Framework - Integration Specs for JUnit 6"
+
+description = "Integration Specs for JUnit 6 as runtime platform"
+
+
+dependencies {
+  testImplementation(projects.spockCore)
+  testImplementation(platform(libs.junit6.bom))
+}

spock-specs/junit6-integration/src/test-java-ge-17/groovy/org/spockframework/JUnit6IntegrationSpec.groovy

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.spockframework
+
+import org.junit.platform.commons.support.ReflectionSupport
+import org.junit.platform.engine.TestEngine
+import org.junit.platform.launcher.Launcher
+import spock.lang.Specification
+
+/**
+ * The specification shall verify that Spock can run with JUnit 6 as a runtime platform.
+ */
+class JUnit6IntegrationSpec extends Specification {
+
+  def "Simple JUnit 6 test"() {
+    expect:
+    true
+  }
+
+  def "Verify JUnit version of JUnit classes"() {
+    expect:
+    cls.package.implementationVersion.startsWith("6.")
+
+    where:
+    cls << [
+      ReflectionSupport.class,//junit-platform-commons
+      Launcher.class,         //junit-platform-launcher
+      TestEngine.class        //junit-platform-engine
+    ]
+  }
+}

spock-spring/boot2-test/boot2-test.gradle

@@ -32,7 +32,7 @@ dependencyManagement {
 }
 
 // Spring dependency management downgrades the jupiter version to 5.7.2 otherwise
-ext['junit-jupiter.version'] = libs.versions.junit.get()
+ext['junit-jupiter.version'] = libs.versions.junit5.get()
 
 dependencies {
   implementation "org.springframework.boot:spring-boot-starter-data-jpa"

spock-spring/boot3-test/boot3-test.gradle

@@ -20,7 +20,7 @@ plugins {
 }
 
 // Spring dependency management downgrades the jupiter version to 5.7.2 otherwise
-ext['junit-jupiter.version'] = libs.versions.junit.get()
+ext['junit-jupiter.version'] = libs.versions.junit5.get()
 
 java {
   toolchain {