fix build with latest spock version

update groovy to 3.0.19 and spock to 2.3

buildSrc/src/main/groovy/eclipsebuild/BundlePlugin.groovy

@@ -177,7 +177,6 @@ class BundlePlugin implements Plugin<Project> {
             // copy the dependencies to the 'libs' folder
             into libDir
             from project.configurations.bundled
-            from project.configurations.bundledSource
         }
     }
 

buildSrc/src/main/groovy/eclipsebuild/testing/EclipseTestExecuter.java

@@ -114,13 +114,13 @@ private void runPDETestsInEclipse(final TestExecutionSpec testSpec, final TestRe
             programArgs.add(optionsFile.getAbsolutePath());
         }
         programArgs.add("-version");
-        programArgs.add("4");
+        programArgs.add("5");
         programArgs.add("-port");
         programArgs.add(Integer.toString(pdeTestPort));
         programArgs.add("-testLoaderClass");
-        programArgs.add("org.eclipse.jdt.internal.junit4.runner.JUnit4TestLoader");
+        programArgs.add("org.eclipse.jdt.internal.junit5.runner.JUnit5TestLoader");
         programArgs.add("-loaderpluginname");
-        programArgs.add("org.eclipse.jdt.junit4.runtime");
+        programArgs.add("org.eclipse.jdt.junit5.runtime");
         programArgs.add("-classNames");
 
         List<String> testNames = new ArrayList(collectTestNames(testTask, testTaskOperationId, workerLeaseService));

buildSrc/src/main/groovy/eclipsebuild/testing/EclipseTestResultProcessor.java

@@ -21,6 +21,8 @@ public class EclipseTestResultProcessor {
 
     private TestDescriptorInternal currentTestSuite;
     private TestDescriptorInternal currentTestClass;
+    private String currentTestClassName;
+
     private TestDescriptorInternal currentTestMethod;
 
     public EclipseTestResultProcessor(TestResultProcessor testResultProcessor, String suite, Object testTaskOperationId, Object rootTestSuiteId, Logger logger) {
@@ -60,7 +62,7 @@ private void onTestRunEndedEvent(EclipseTestEvent.TestRunEnded event) {
     }
 
     private void onTestStartedEvent(EclipseTestEvent.TestStarted event) {
-        logger.info("Test started: " + event.getTestName());
+        logger.info("Test started (" + event.getTestId() + "): " + event.getTestName());
 
         // TODO need idGenerator
         String testClass = event.getTestName();
@@ -74,10 +76,13 @@ private void onTestStartedEvent(EclipseTestEvent.TestStarted event) {
         String classId = event.getTestId() + " class";
         if (this.currentTestClass == null) {
             this.currentTestClass = testClass(classId, testClass, this.currentTestSuite);
+            this.currentTestClassName = testClass;
             this.resultProcessor.started(this.currentTestClass, startEvent(this.currentTestSuite));
-        } else if (!this.currentTestClass.getId().equals(classId)) {
+        } else if (!this.currentTestClass.getId().equals(classId) && !this.currentTestClassName.equals(testClass)) {
+            logger.info("Test completed (" + event.getTestId() + "): " + event.getTestName());
             this.resultProcessor.completed(this.currentTestClass.getId(), completeEvent(TestResult.ResultType.SUCCESS));
             this.currentTestClass = testClass(classId, testClass, this.currentTestSuite);
+            this.currentTestClassName = testClass;
             this.resultProcessor.started(this.currentTestClass, startEvent(this.currentTestSuite));
         }
 
@@ -86,10 +91,12 @@ private void onTestStartedEvent(EclipseTestEvent.TestStarted event) {
     }
 
     private void onTestEndedEvent(EclipseTestEvent.TestEnded event) {
+        logger.info("Test completed (" + event.getTestId() + "): " + event.getTestName());
         this.resultProcessor.completed(event.getTestId(), completeEvent(TestResult.ResultType.SUCCESS));
     }
 
     private void onTestFailedEvent(EclipseTestEvent.TestFailed event) {
+        logger.info("Test failed (" + event.getTestId() + "): " + event.getTestName());
         String message = event.getTestName() + " failed";
         if (event.getExpected() != null || event.getActual() != null) {
             message += " (expected=" + event.getExpected() + ", actual=" + event.getActual() + ")";

gradle.properties

@@ -5,8 +5,8 @@ toolingApiVersion=8.1.1
 guavaVersion=32.1.2
 slf4jLibVersion=1.7.2
 cglibLibVersion=2.2
-groovyLibVersion=2.5.14
-spockLibVersion=1.3-groovy-2.5
+groovyLibVersion=3.0.19
+spockLibVersion=2.3-groovy-3.0
 objenesisLibVersion=2.2
 
 # repository urls

org.eclipse.buildship.core.test/.classpath

@@ -8,49 +8,51 @@
   <classpathentry kind="con" path="GROOVY_DSL_SUPPORT"/>
   <classpathentry kind="src" path="src/main/groovy"/>
   <classpathentry kind="output" path="bin"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-1.9.15.jar" sourcepath="lib/ant-1.9.15-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-antlr-1.9.15.jar" sourcepath="lib/ant-antlr-1.9.15-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-junit-1.9.15.jar" sourcepath="lib/ant-junit-1.9.15-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/ant-launcher-1.9.15.jar" sourcepath="lib/ant-launcher-1.9.15-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/ant-1.10.12.jar" sourcepath="lib/ant-1.10.12-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/ant-antlr-1.10.12.jar" sourcepath="lib/ant-antlr-1.10.12-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/ant-junit-1.10.12.jar" sourcepath="lib/ant-junit-1.10.12-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/ant-launcher-1.10.12.jar" sourcepath="lib/ant-launcher-1.10.12-sources.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.jar" sourcepath="lib/cglib-nodep-2.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/commons-cli-1.4.jar" sourcepath="lib/commons-cli-1.4-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-2.5.14.jar" sourcepath="lib/groovy-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-ant-2.5.14.jar" sourcepath="lib/groovy-ant-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-cli-commons-2.5.14.jar" sourcepath="lib/groovy-cli-commons-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-cli-picocli-2.5.14.jar" sourcepath="lib/groovy-cli-picocli-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-console-2.5.14.jar" sourcepath="lib/groovy-console-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-datetime-2.5.14.jar" sourcepath="lib/groovy-datetime-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-docgenerator-2.5.14.jar" sourcepath="lib/groovy-docgenerator-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-groovydoc-2.5.14.jar" sourcepath="lib/groovy-groovydoc-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-groovysh-2.5.14.jar" sourcepath="lib/groovy-groovysh-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-jmx-2.5.14.jar" sourcepath="lib/groovy-jmx-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-json-2.5.14.jar" sourcepath="lib/groovy-json-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-jsr223-2.5.14.jar" sourcepath="lib/groovy-jsr223-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-macro-2.5.14.jar" sourcepath="lib/groovy-macro-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-nio-2.5.14.jar" sourcepath="lib/groovy-nio-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-servlet-2.5.14.jar" sourcepath="lib/groovy-servlet-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-sql-2.5.14.jar" sourcepath="lib/groovy-sql-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-swing-2.5.14.jar" sourcepath="lib/groovy-swing-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-templates-2.5.14.jar" sourcepath="lib/groovy-templates-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-test-2.5.14.jar" sourcepath="lib/groovy-test-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-test-junit5-2.5.14.jar" sourcepath="lib/groovy-test-junit5-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-testng-2.5.14.jar" sourcepath="lib/groovy-testng-2.5.14-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/groovy-xml-2.5.14.jar" sourcepath="lib/groovy-xml-2.5.14-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-3.0.19.jar" sourcepath="lib/groovy-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-ant-3.0.19.jar" sourcepath="lib/groovy-ant-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-astbuilder-3.0.19.jar" sourcepath="lib/groovy-astbuilder-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-cli-picocli-3.0.19.jar" sourcepath="lib/groovy-cli-picocli-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-console-3.0.19.jar" sourcepath="lib/groovy-console-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-datetime-3.0.19.jar" sourcepath="lib/groovy-datetime-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-docgenerator-3.0.19.jar" sourcepath="lib/groovy-docgenerator-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-groovydoc-3.0.19.jar" sourcepath="lib/groovy-groovydoc-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-groovysh-3.0.19.jar" sourcepath="lib/groovy-groovysh-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-jmx-3.0.19.jar" sourcepath="lib/groovy-jmx-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-json-3.0.19.jar" sourcepath="lib/groovy-json-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-jsr223-3.0.19.jar" sourcepath="lib/groovy-jsr223-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-macro-3.0.19.jar" sourcepath="lib/groovy-macro-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-nio-3.0.19.jar" sourcepath="lib/groovy-nio-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-servlet-3.0.19.jar" sourcepath="lib/groovy-servlet-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-sql-3.0.19.jar" sourcepath="lib/groovy-sql-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-swing-3.0.19.jar" sourcepath="lib/groovy-swing-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-templates-3.0.19.jar" sourcepath="lib/groovy-templates-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-test-3.0.19.jar" sourcepath="lib/groovy-test-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-test-junit5-3.0.19.jar" sourcepath="lib/groovy-test-junit5-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-testng-3.0.19.jar" sourcepath="lib/groovy-testng-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/groovy-xml-3.0.19.jar" sourcepath="lib/groovy-xml-3.0.19-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/hamcrest-2.2.jar" sourcepath="lib/hamcrest-2.2-sources.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar" sourcepath="lib/hamcrest-core-1.3-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/jcommander-1.72.jar" sourcepath="lib/jcommander-1.72-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/javaparser-core-3.25.4.jar" sourcepath="lib/javaparser-core-3.25.4-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/jcommander-1.78.jar" sourcepath="lib/jcommander-1.78-sources.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/jline-2.14.6.jar" sourcepath="lib/jline-2.14.6-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-4.13.1.jar" sourcepath="lib/junit-4.13.1-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-jupiter-api-5.4.2.jar" sourcepath="lib/junit-jupiter-api-5.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-jupiter-engine-5.4.2.jar" sourcepath="lib/junit-jupiter-engine-5.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-platform-commons-1.4.2.jar" sourcepath="lib/junit-platform-commons-1.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-platform-engine-1.4.2.jar" sourcepath="lib/junit-platform-engine-1.4.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/junit-platform-launcher-1.4.2.jar" sourcepath="lib/junit-platform-launcher-1.4.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/jquery-3.5.1.jar" sourcepath="lib/jquery-3.5.1-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/junit-4.13.2.jar" sourcepath="lib/junit-4.13.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/junit-jupiter-api-5.9.2.jar" sourcepath="lib/junit-jupiter-api-5.9.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/junit-jupiter-engine-5.9.2.jar" sourcepath="lib/junit-jupiter-engine-5.9.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/junit-platform-commons-1.9.2.jar" sourcepath="lib/junit-platform-commons-1.9.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/junit-platform-engine-1.9.2.jar" sourcepath="lib/junit-platform-engine-1.9.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/junit-platform-launcher-1.9.2.jar" sourcepath="lib/junit-platform-launcher-1.9.2-sources.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/objenesis-2.2.jar" sourcepath="lib/objenesis-2.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/opentest4j-1.1.1.jar" sourcepath="lib/opentest4j-1.1.1-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/picocli-4.3.2.jar" sourcepath="lib/picocli-4.3.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/opentest4j-1.2.0.jar" sourcepath="lib/opentest4j-1.2.0-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/picocli-4.6.3.jar" sourcepath="lib/picocli-4.6.3-sources.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/qdox-1.12.1.jar" sourcepath="lib/qdox-1.12.1-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.2.jar" sourcepath="lib/slf4j-api-1.7.2-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.7.32.jar" sourcepath="lib/slf4j-api-1.7.32-sources.jar"/>
   <classpathentry exported="true" kind="lib" path="lib/slf4j-simple-1.7.2.jar" sourcepath="lib/slf4j-simple-1.7.2-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/spock-core-1.3-groovy-2.5.jar" sourcepath="lib/spock-core-1.3-groovy-2.5-sources.jar"/>
-  <classpathentry exported="true" kind="lib" path="lib/testng-6.13.1.jar" sourcepath="lib/testng-6.13.1-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/spock-core-2.3-groovy-3.0.jar" sourcepath="lib/spock-core-2.3-groovy-3.0-sources.jar"/>
+  <classpathentry exported="true" kind="lib" path="lib/testng-7.5.jar" sourcepath="lib/testng-7.5-sources.jar"/>
 </classpath>

org.eclipse.buildship.core.test/META-INF/MANIFEST.MF

@@ -7,50 +7,52 @@ Bundle-Vendor: Eclipse Buildship
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Fragment-Host: org.eclipse.buildship.core
 Comment: junit has to be a required bundle, otherwise the tests won't launch for headless builds
-Require-Bundle: org.junit
+Require-Bundle: org.junit.platform.engine
 Bundle-ClassPath: .,
- lib/ant-1.9.15.jar,
- lib/ant-antlr-1.9.15.jar,
- lib/ant-junit-1.9.15.jar,
- lib/ant-launcher-1.9.15.jar,
+ lib/ant-1.10.12.jar,
+ lib/ant-antlr-1.10.12.jar,
+ lib/ant-junit-1.10.12.jar,
+ lib/ant-launcher-1.10.12.jar,
  lib/cglib-nodep-2.2.jar,
- lib/commons-cli-1.4.jar,
- lib/groovy-2.5.14.jar,
- lib/groovy-ant-2.5.14.jar,
- lib/groovy-cli-commons-2.5.14.jar,
- lib/groovy-cli-picocli-2.5.14.jar,
- lib/groovy-console-2.5.14.jar,
- lib/groovy-datetime-2.5.14.jar,
- lib/groovy-docgenerator-2.5.14.jar,
- lib/groovy-groovydoc-2.5.14.jar,
- lib/groovy-groovysh-2.5.14.jar,
- lib/groovy-jmx-2.5.14.jar,
- lib/groovy-json-2.5.14.jar,
- lib/groovy-jsr223-2.5.14.jar,
- lib/groovy-macro-2.5.14.jar,
- lib/groovy-nio-2.5.14.jar,
- lib/groovy-servlet-2.5.14.jar,
- lib/groovy-sql-2.5.14.jar,
- lib/groovy-swing-2.5.14.jar,
- lib/groovy-templates-2.5.14.jar,
- lib/groovy-test-2.5.14.jar,
- lib/groovy-test-junit5-2.5.14.jar,
- lib/groovy-testng-2.5.14.jar,
- lib/groovy-xml-2.5.14.jar,
+ lib/groovy-3.0.19.jar,
+ lib/groovy-ant-3.0.19.jar,
+ lib/groovy-astbuilder-3.0.19.jar,
+ lib/groovy-cli-picocli-3.0.19.jar,
+ lib/groovy-console-3.0.19.jar,
+ lib/groovy-datetime-3.0.19.jar,
+ lib/groovy-docgenerator-3.0.19.jar,
+ lib/groovy-groovydoc-3.0.19.jar,
+ lib/groovy-groovysh-3.0.19.jar,
+ lib/groovy-jmx-3.0.19.jar,
+ lib/groovy-json-3.0.19.jar,
+ lib/groovy-jsr223-3.0.19.jar,
+ lib/groovy-macro-3.0.19.jar,
+ lib/groovy-nio-3.0.19.jar,
+ lib/groovy-servlet-3.0.19.jar,
+ lib/groovy-sql-3.0.19.jar,
+ lib/groovy-swing-3.0.19.jar,
+ lib/groovy-templates-3.0.19.jar,
+ lib/groovy-test-3.0.19.jar,
+ lib/groovy-test-junit5-3.0.19.jar,
+ lib/groovy-testng-3.0.19.jar,
+ lib/groovy-xml-3.0.19.jar,
+ lib/hamcrest-2.2.jar,
  lib/hamcrest-core-1.3.jar,
- lib/jcommander-1.72.jar,
+ lib/javaparser-core-3.25.4.jar,
+ lib/jcommander-1.78.jar,
  lib/jline-2.14.6.jar,
- lib/junit-4.13.1.jar,
- lib/junit-jupiter-api-5.4.2.jar,
- lib/junit-jupiter-engine-5.4.2.jar,
- lib/junit-platform-commons-1.4.2.jar,
- lib/junit-platform-engine-1.4.2.jar,
- lib/junit-platform-launcher-1.4.2.jar,
+ lib/jquery-3.5.1.jar,
+ lib/junit-4.13.2.jar,
+ lib/junit-jupiter-api-5.9.2.jar,
+ lib/junit-jupiter-engine-5.9.2.jar,
+ lib/junit-platform-commons-1.9.2.jar,
+ lib/junit-platform-engine-1.9.2.jar,
+ lib/junit-platform-launcher-1.9.2.jar,
  lib/objenesis-2.2.jar,
- lib/opentest4j-1.1.1.jar,
- lib/picocli-4.3.2.jar,
+ lib/opentest4j-1.2.0.jar,
+ lib/picocli-4.6.3.jar,
  lib/qdox-1.12.1.jar,
- lib/slf4j-api-1.7.2.jar,
+ lib/slf4j-api-1.7.32.jar,
  lib/slf4j-simple-1.7.2.jar,
- lib/spock-core-1.3-groovy-2.5.jar,
- lib/testng-6.13.1.jar
+ lib/spock-core-2.3-groovy-3.0.jar,
+ lib/testng-7.5.jar

org.eclipse.buildship.core.test/build.gradle

@@ -4,7 +4,7 @@ apply plugin: eclipsebuild.TestBundlePlugin
 apply plugin: 'groovy'
 
 dependencies {
-    bundled 'org.spockframework:spock-core:1.3-groovy-2.5'
+    bundled "org.spockframework:spock-core:$spockLibVersion"
     implementation project(':org.eclipse.buildship.compat')
     api project(':org.eclipse.buildship.core')
 }

org.eclipse.buildship.core.test/src/main/groovy/org/eclipse/buildship/core/internal/test/fixtures/WorkspaceSpecification.groovy

@@ -11,8 +11,11 @@ package org.eclipse.buildship.core.internal.test.fixtures
 
 import org.junit.Rule
 import org.junit.rules.TemporaryFolder
+import org.junit.runner.RunWith
+import org.spockframework.runtime.SpockRuntime
 import spock.lang.AutoCleanup
 import spock.lang.Specification
+import spock.lang.TempDir
 
 import com.google.common.collect.ImmutableList
 import com.google.common.io.Files
@@ -53,8 +56,8 @@ import org.eclipse.buildship.core.internal.workspace.WorkspaceOperations
  */
 abstract class WorkspaceSpecification extends Specification {
 
-    @Rule
-    TemporaryFolder tempFolderProvider
+    @TempDir
+    public File tempFolderProvider
 
     @AutoCleanup
     TestEnvironment environment = TestEnvironment.INSTANCE
@@ -64,7 +67,8 @@ abstract class WorkspaceSpecification extends Specification {
     private LogCollector logCollector = new LogCollector()
 
     def setup() {
-        externalTestDir = tempFolderProvider.newFolder('external')
+        externalTestDir = new File(tempFolderProvider, 'external')
+        externalTestDir.mkdirs()
         Platform.addLogListener(logCollector)
         EclipseVmUtil.findOrRegisterVM("8", new File((String) System.getProperty("jdk8.location")))
         EclipseVmUtil.findOrRegisterVM("11", new File((String) System.getProperty("jdk11.location")))