Merge branch 'master' into SpyStatic

Author: AndreasTu

.github/renovate.json5

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

README.adoc

@@ -39,8 +39,24 @@ Java 12+).
 Releases are available from
 https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.spockframework%22[Maven
 Central]. Development snapshots are available from
-https://oss.sonatype.org/content/repositories/snapshots/org/spockframework/[Sonatype
-OSS].
+https://central.sonatype.com/repository/maven-snapshots/org/spockframework/spock-core/maven-metadata.xml[Sonatype
+Snapshot].
+
+==== Snapshot Releases
+
+Snapshots can be used by adding the Sonatype Snapshot repository:
+
+[source,groovy,subs="attributes"]
+----
+repositories {
+    // ...
+    maven { url 'https://central.sonatype.com/repository/maven-snapshots/' }
+}
+
+dependencies {
+    testImplementation 'org.spockframework:spock-core:{spock-snapshot-version}-groovy-4.0-SNAPSHOT'
+}
+----
 
 ==== Ad-Hoc Intermediate Releases
 

build.gradle

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

gradle/libs.versions.toml

@@ -1,11 +1,12 @@
 [versions]
-asciidoctorj = '3.0.0'
+asciidoctorj = '3.0.1'
 groovy2 = '2.5.23'
 groovy3 = '3.0.25'
 groovy4 = '4.0.29'
 groovy5 = '5.0.2'
 jacoco = '0.8.14'
-junit = '5.14.1'
+junit5 = '5.14.1'
+junit6 = '6.0.1'
 # The VersionRange used by OSGi to check compatibility with JUnit Platform.
 junitPlatformVersionRange = "[1.12,7)"
 asm = '9.9'
@@ -32,7 +33,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"

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-core/src/main/java/org/spockframework/util/JavaProcessThreadDumpCollector.java

@@ -16,12 +16,15 @@
 
 package org.spockframework.util;
 
+import org.codehaus.groovy.runtime.ResourceGroovyMethods;
 import org.spockframework.runtime.SpockException;
 import org.spockframework.runtime.extension.builtin.ThreadDumpUtility;
 import org.spockframework.runtime.extension.builtin.ThreadDumpUtilityType;
 
 import java.io.*;
 import java.lang.management.ManagementFactory;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -66,21 +69,23 @@ public void appendThreadDumpOfCurrentJvm(StringBuilder builder) throws IOExcepti
         .append(TextUtil.repeatChar('-', utilityName.length()))
         .append("\n");
 
+
+      File threadDumpFile = Files.createTempFile("Spock-threaddump", ".txt").toFile();
+
       Process process = new ProcessBuilder(command)
         .redirectErrorStream(true)
+        .redirectOutput(ProcessBuilder.Redirect.to(threadDumpFile))
         .start();
 
-      captureProcessOutput(process, builder);
       process.waitFor();
+
+      readAndDeleteFile(builder, threadDumpFile);
     }
 
-    private void captureProcessOutput(Process process, StringBuilder builder) throws IOException {
-      try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
-        String line;
-        while ((line = reader.readLine()) != null) {
-          builder.append(line).append("\n");
-        }
-      }
+    private void readAndDeleteFile(StringBuilder builder, File threadDumpFile) throws IOException {
+      builder.append(ResourceGroovyMethods.getText(threadDumpFile, StandardCharsets.UTF_8.name()));
+      //noinspection ResultOfMethodCallIgnored
+      threadDumpFile.delete(); // We do not care if the temp file could not be deleted.
     }
 
     private static Path getJavaHome() {

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 {

spock-testkit/testkit.gradle

@@ -1,24 +1,19 @@
-ext.displayName = "Spock Framework - Temp Specs for Core Module"
+plugins {
+  id 'jvm-test-suite'
+}
 
-//configurations {
-//  junit
-//}
+ext.displayName = "Spock Framework - Spock TestKit Specs for Core Module"
 
 dependencies {
   api projects.spockCore
 
-  testRuntimeOnly libs.asm
-  testRuntimeOnly libs.bytebuddy
-  testRuntimeOnly libs.cglib
-  testRuntimeOnly libs.objenesis
-  testRuntimeOnly libs.h2database
   testRuntimeOnly libs.junit.platform.console
-  testImplementation libs.junit.platform.testkit
 
+  testImplementation libs.junit.platform.testkit
   testImplementation libs.junit.jupiter
 }
 
-tasks.named("test", Test) {
+tasks.withType(Test).configureEach {
   reports.junitXml.required = true
   reports.html.required = false
 
@@ -43,3 +38,31 @@ tasks.register("consoleLauncherTest", JavaExec) {
   args("--reports-dir", reportsDir)
 //  systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
 }
+
+
+if (javaVersion >= 17) {
+  testing {
+    suites {
+      junit6Test(JvmTestSuite) {
+        useJUnitJupiter(libs.versions.junit6)
+        sources {
+          groovy {
+            srcDirs = ['src/test/groovy']
+          }
+        }
+
+        dependencies {
+          implementation projects.spockCore
+
+          implementation platform(libs.junit6.bom)
+          implementation libs.junit.platform.testkit
+          implementation libs.junit.jupiter
+        }
+      }
+    }
+  }
+
+  tasks.named('check') {
+    dependsOn(testing.suites.junit6Test)
+  }
+}