diff --git a/org.eclipse.buildship.oomph.test/.classpath b/org.eclipse.buildship.oomph.test/.classpath index 2f34f26b52..d0adc47979 100644 --- a/org.eclipse.buildship.oomph.test/.classpath +++ b/org.eclipse.buildship.oomph.test/.classpath @@ -4,49 +4,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF b/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF index fbb191ea71..e14f496feb 100644 --- a/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF +++ b/org.eclipse.buildship.oomph.test/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Buildship Bundle-RequiredExecutionEnvironment: JavaSE-11 Fragment-Host: org.eclipse.buildship.oomph Automatic-Module-Name: org.eclipse.buildship.oomph.test -Require-Bundle: org.junit, +Require-Bundle: org.eclipse.buildship.testfixtures, org.eclipse.oomph.setup.core, com.google.guava;bundle-version="[30.1.0,32.0.0)", org.eclipse.debug.core, @@ -16,49 +16,3 @@ Require-Bundle: org.junit, Import-Package: org.eclipse.buildship.oomph, org.eclipse.buildship.oomph.impl, org.eclipse.oomph.resources.impl;version="[1.1.0,2.0.0)" -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/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/hamcrest-core-1.3.jar, - lib/jcommander-1.72.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/objenesis-2.2.jar, - lib/opentest4j-1.1.1.jar, - lib/picocli-4.3.2.jar, - lib/qdox-1.12.1.jar, - lib/slf4j-api-1.7.2.jar, - lib/slf4j-simple-1.7.2.jar, - lib/spock-core-1.3-groovy-2.5.jar, - lib/testng-6.13.1.jar diff --git a/org.eclipse.buildship.oomph.test/build.gradle b/org.eclipse.buildship.oomph.test/build.gradle index 35efe40297..fea0ad3c96 100644 --- a/org.eclipse.buildship.oomph.test/build.gradle +++ b/org.eclipse.buildship.oomph.test/build.gradle @@ -2,16 +2,10 @@ apply plugin: eclipsebuild.TestBundlePlugin apply plugin: 'groovy' dependencies { - implementation "org.codehaus.groovy:groovy-all:$groovyLibVersion" - bundled "org.codehaus.groovy:groovy-all:$groovyLibVersion" - bundled "org.objenesis:objenesis:$objenesisLibVersion" - bundled "org.spockframework:spock-core:$spockLibVersion" - bundled "cglib:cglib-nodep:$cglibLibVersion" - bundled "org.slf4j:slf4j-simple:$slf4jLibVersion" - bundled 'org.spockframework:spock-core:1.3-groovy-2.5' implementation project(':org.eclipse.buildship.compat') implementation project(':org.eclipse.buildship.core') implementation project(':org.eclipse.buildship.oomph') + implementation project(':org.eclipse.buildship.testfixtures') } eclipseTest { diff --git a/org.eclipse.buildship.oomph.test/lib/ant-1.9.15-sources.jar b/org.eclipse.buildship.oomph.test/lib/ant-1.9.15-sources.jar deleted file mode 100644 index 5fb5f9c8e3..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-1.9.15-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/ant-1.9.15.jar b/org.eclipse.buildship.oomph.test/lib/ant-1.9.15.jar deleted file mode 100644 index 720619cf6f..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-1.9.15.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/ant-antlr-1.9.15-sources.jar b/org.eclipse.buildship.oomph.test/lib/ant-antlr-1.9.15-sources.jar deleted file mode 100644 index 6dbde36d94..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-antlr-1.9.15-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/ant-antlr-1.9.15.jar b/org.eclipse.buildship.oomph.test/lib/ant-antlr-1.9.15.jar deleted file mode 100644 index 3fd123a17c..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-antlr-1.9.15.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/ant-junit-1.9.15-sources.jar b/org.eclipse.buildship.oomph.test/lib/ant-junit-1.9.15-sources.jar deleted file mode 100644 index e091906055..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-junit-1.9.15-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/ant-junit-1.9.15.jar b/org.eclipse.buildship.oomph.test/lib/ant-junit-1.9.15.jar deleted file mode 100644 index 54323dfb05..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-junit-1.9.15.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/ant-launcher-1.9.15-sources.jar b/org.eclipse.buildship.oomph.test/lib/ant-launcher-1.9.15-sources.jar deleted file mode 100644 index 59301a9f48..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-launcher-1.9.15-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/ant-launcher-1.9.15.jar b/org.eclipse.buildship.oomph.test/lib/ant-launcher-1.9.15.jar deleted file mode 100644 index 23c9899129..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/ant-launcher-1.9.15.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/apiguardian-api-1.0.0.jar b/org.eclipse.buildship.oomph.test/lib/apiguardian-api-1.0.0.jar deleted file mode 100644 index 6cbff70f22..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/apiguardian-api-1.0.0.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/cglib-nodep-2.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/cglib-nodep-2.2-sources.jar deleted file mode 100644 index 6cc192b704..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/cglib-nodep-2.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/cglib-nodep-2.2.jar b/org.eclipse.buildship.oomph.test/lib/cglib-nodep-2.2.jar deleted file mode 100644 index ed07cb507f..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/cglib-nodep-2.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/commons-cli-1.4-sources.jar b/org.eclipse.buildship.oomph.test/lib/commons-cli-1.4-sources.jar deleted file mode 100644 index b747279d2d..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/commons-cli-1.4-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/commons-cli-1.4.jar b/org.eclipse.buildship.oomph.test/lib/commons-cli-1.4.jar deleted file mode 100644 index 22deb3089e..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/commons-cli-1.4.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-2.5.14-sources.jar deleted file mode 100644 index 0495f2c264..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-2.5.14.jar deleted file mode 100644 index 48575dbe7f..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-all-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-all-2.5.14-sources.jar deleted file mode 100644 index a40d4ca412..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-all-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-ant-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-ant-2.5.14-sources.jar deleted file mode 100644 index 4bb94fa02c..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-ant-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-ant-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-ant-2.5.14.jar deleted file mode 100644 index e67dad67d1..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-ant-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-cli-commons-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-cli-commons-2.5.14-sources.jar deleted file mode 100644 index 625bf0621d..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-cli-commons-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-cli-commons-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-cli-commons-2.5.14.jar deleted file mode 100644 index d9a9202a8b..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-cli-commons-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-cli-picocli-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-cli-picocli-2.5.14-sources.jar deleted file mode 100644 index 23184fe882..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-cli-picocli-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-cli-picocli-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-cli-picocli-2.5.14.jar deleted file mode 100644 index 0e27bd13a0..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-cli-picocli-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-console-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-console-2.5.14-sources.jar deleted file mode 100644 index 39f927945c..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-console-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-console-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-console-2.5.14.jar deleted file mode 100644 index 0d7d3d29c8..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-console-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-datetime-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-datetime-2.5.14-sources.jar deleted file mode 100644 index bd0473dbda..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-datetime-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-datetime-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-datetime-2.5.14.jar deleted file mode 100644 index c372949610..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-datetime-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-docgenerator-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-docgenerator-2.5.14-sources.jar deleted file mode 100644 index 7141c62c1d..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-docgenerator-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-docgenerator-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-docgenerator-2.5.14.jar deleted file mode 100644 index ec2a8cfaec..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-docgenerator-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-groovydoc-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-groovydoc-2.5.14-sources.jar deleted file mode 100644 index 4c96a07ad6..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-groovydoc-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-groovydoc-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-groovydoc-2.5.14.jar deleted file mode 100644 index 8beead0c5d..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-groovydoc-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-groovysh-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-groovysh-2.5.14-sources.jar deleted file mode 100644 index 3b6cf355cb..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-groovysh-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-groovysh-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-groovysh-2.5.14.jar deleted file mode 100644 index 652d32c3b7..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-groovysh-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-jmx-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-jmx-2.5.14-sources.jar deleted file mode 100644 index 740624b351..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-jmx-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-jmx-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-jmx-2.5.14.jar deleted file mode 100644 index 4c41c61a2e..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-jmx-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-json-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-json-2.5.14-sources.jar deleted file mode 100644 index bf1cc34870..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-json-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-json-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-json-2.5.14.jar deleted file mode 100644 index cf2e02860f..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-json-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-jsr223-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-jsr223-2.5.14-sources.jar deleted file mode 100644 index afb7559e10..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-jsr223-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-jsr223-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-jsr223-2.5.14.jar deleted file mode 100644 index 16b054bc7a..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-jsr223-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-macro-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-macro-2.5.14-sources.jar deleted file mode 100644 index 83014846cc..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-macro-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-macro-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-macro-2.5.14.jar deleted file mode 100644 index b5b5d1b517..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-macro-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-nio-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-nio-2.5.14-sources.jar deleted file mode 100644 index e147b7079b..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-nio-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-nio-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-nio-2.5.14.jar deleted file mode 100644 index f805298a81..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-nio-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-servlet-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-servlet-2.5.14-sources.jar deleted file mode 100644 index 9393e6e978..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-servlet-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-servlet-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-servlet-2.5.14.jar deleted file mode 100644 index 7983d56311..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-servlet-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-sql-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-sql-2.5.14-sources.jar deleted file mode 100644 index 46d066e031..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-sql-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-sql-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-sql-2.5.14.jar deleted file mode 100644 index b599621726..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-sql-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-swing-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-swing-2.5.14-sources.jar deleted file mode 100644 index 1d26256083..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-swing-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-swing-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-swing-2.5.14.jar deleted file mode 100644 index 8a252c312c..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-swing-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-templates-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-templates-2.5.14-sources.jar deleted file mode 100644 index c74bd91209..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-templates-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-templates-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-templates-2.5.14.jar deleted file mode 100644 index cea74f95e2..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-templates-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-test-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-test-2.5.14-sources.jar deleted file mode 100644 index d7729ccc79..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-test-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-test-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-test-2.5.14.jar deleted file mode 100644 index 2ca6baf08f..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-test-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-test-junit5-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-test-junit5-2.5.14-sources.jar deleted file mode 100644 index 0f5a4210ac..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-test-junit5-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-test-junit5-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-test-junit5-2.5.14.jar deleted file mode 100644 index 6f5ee52951..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-test-junit5-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-testng-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-testng-2.5.14-sources.jar deleted file mode 100644 index 5a8d57f1b0..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-testng-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-testng-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-testng-2.5.14.jar deleted file mode 100644 index 28cf55a8ae..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-testng-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-xml-2.5.14-sources.jar b/org.eclipse.buildship.oomph.test/lib/groovy-xml-2.5.14-sources.jar deleted file mode 100644 index 42beb3a4f5..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-xml-2.5.14-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/groovy-xml-2.5.14.jar b/org.eclipse.buildship.oomph.test/lib/groovy-xml-2.5.14.jar deleted file mode 100644 index b6abadcd77..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/groovy-xml-2.5.14.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/hamcrest-core-1.3-sources.jar b/org.eclipse.buildship.oomph.test/lib/hamcrest-core-1.3-sources.jar deleted file mode 100644 index c3c110b4da..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/hamcrest-core-1.3-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/hamcrest-core-1.3.jar b/org.eclipse.buildship.oomph.test/lib/hamcrest-core-1.3.jar deleted file mode 100644 index 9d5fe16e3d..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/hamcrest-core-1.3.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/jcommander-1.72-sources.jar b/org.eclipse.buildship.oomph.test/lib/jcommander-1.72-sources.jar deleted file mode 100644 index b2242651f6..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/jcommander-1.72-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/jcommander-1.72.jar b/org.eclipse.buildship.oomph.test/lib/jcommander-1.72.jar deleted file mode 100644 index acb8e609b1..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/jcommander-1.72.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/jline-2.14.6-sources.jar b/org.eclipse.buildship.oomph.test/lib/jline-2.14.6-sources.jar deleted file mode 100644 index 82b7217578..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/jline-2.14.6-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/jline-2.14.6.jar b/org.eclipse.buildship.oomph.test/lib/jline-2.14.6.jar deleted file mode 100644 index fe11ed545b..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/jline-2.14.6.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-4.13.1-sources.jar b/org.eclipse.buildship.oomph.test/lib/junit-4.13.1-sources.jar deleted file mode 100644 index b68ac35afa..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-4.13.1-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-4.13.1.jar b/org.eclipse.buildship.oomph.test/lib/junit-4.13.1.jar deleted file mode 100644 index b376ffc16f..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-4.13.1.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-api-5.4.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/junit-jupiter-api-5.4.2-sources.jar deleted file mode 100644 index 3cb82c7622..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-api-5.4.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-api-5.4.2.jar b/org.eclipse.buildship.oomph.test/lib/junit-jupiter-api-5.4.2.jar deleted file mode 100644 index 40828b7a90..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-api-5.4.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-engine-5.4.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/junit-jupiter-engine-5.4.2-sources.jar deleted file mode 100644 index 699c3fc176..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-engine-5.4.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-engine-5.4.2.jar b/org.eclipse.buildship.oomph.test/lib/junit-jupiter-engine-5.4.2.jar deleted file mode 100644 index 3444a9806a..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-jupiter-engine-5.4.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-platform-commons-1.4.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/junit-platform-commons-1.4.2-sources.jar deleted file mode 100644 index 37e4b89b5b..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-platform-commons-1.4.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-platform-commons-1.4.2.jar b/org.eclipse.buildship.oomph.test/lib/junit-platform-commons-1.4.2.jar deleted file mode 100644 index 270552518e..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-platform-commons-1.4.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-platform-engine-1.4.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/junit-platform-engine-1.4.2-sources.jar deleted file mode 100644 index 2f487c5105..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-platform-engine-1.4.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-platform-engine-1.4.2.jar b/org.eclipse.buildship.oomph.test/lib/junit-platform-engine-1.4.2.jar deleted file mode 100644 index 2c46ae92d3..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-platform-engine-1.4.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-platform-launcher-1.4.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/junit-platform-launcher-1.4.2-sources.jar deleted file mode 100644 index b2da66488c..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-platform-launcher-1.4.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/junit-platform-launcher-1.4.2.jar b/org.eclipse.buildship.oomph.test/lib/junit-platform-launcher-1.4.2.jar deleted file mode 100644 index 0d0f5a1dea..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/junit-platform-launcher-1.4.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/objenesis-2.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/objenesis-2.2-sources.jar deleted file mode 100644 index b305b0d789..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/objenesis-2.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/objenesis-2.2.jar b/org.eclipse.buildship.oomph.test/lib/objenesis-2.2.jar deleted file mode 100644 index e0688ed8f2..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/objenesis-2.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/opentest4j-1.1.1-sources.jar b/org.eclipse.buildship.oomph.test/lib/opentest4j-1.1.1-sources.jar deleted file mode 100644 index 7cb1de75d0..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/opentest4j-1.1.1-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/opentest4j-1.1.1.jar b/org.eclipse.buildship.oomph.test/lib/opentest4j-1.1.1.jar deleted file mode 100644 index 3f355292e0..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/opentest4j-1.1.1.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/picocli-4.3.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/picocli-4.3.2-sources.jar deleted file mode 100644 index c029c52a89..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/picocli-4.3.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/picocli-4.3.2.jar b/org.eclipse.buildship.oomph.test/lib/picocli-4.3.2.jar deleted file mode 100644 index f338506d0a..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/picocli-4.3.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/qdox-1.12.1-sources.jar b/org.eclipse.buildship.oomph.test/lib/qdox-1.12.1-sources.jar deleted file mode 100644 index 8dba3f61b6..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/qdox-1.12.1-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/qdox-1.12.1.jar b/org.eclipse.buildship.oomph.test/lib/qdox-1.12.1.jar deleted file mode 100644 index 092fc51c1e..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/qdox-1.12.1.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/slf4j-api-1.7.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/slf4j-api-1.7.2-sources.jar deleted file mode 100644 index bdb821acd4..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/slf4j-api-1.7.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/slf4j-api-1.7.2.jar b/org.eclipse.buildship.oomph.test/lib/slf4j-api-1.7.2.jar deleted file mode 100644 index 1a8870833b..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/slf4j-api-1.7.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/slf4j-simple-1.7.2-sources.jar b/org.eclipse.buildship.oomph.test/lib/slf4j-simple-1.7.2-sources.jar deleted file mode 100644 index 20dbb9bac9..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/slf4j-simple-1.7.2-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/slf4j-simple-1.7.2.jar b/org.eclipse.buildship.oomph.test/lib/slf4j-simple-1.7.2.jar deleted file mode 100644 index 2498c443b5..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/slf4j-simple-1.7.2.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/spock-core-1.3-groovy-2.5-sources.jar b/org.eclipse.buildship.oomph.test/lib/spock-core-1.3-groovy-2.5-sources.jar deleted file mode 100644 index 31692132c8..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/spock-core-1.3-groovy-2.5-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/spock-core-1.3-groovy-2.5.jar b/org.eclipse.buildship.oomph.test/lib/spock-core-1.3-groovy-2.5.jar deleted file mode 100644 index 119099e983..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/spock-core-1.3-groovy-2.5.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/testng-6.13.1-sources.jar b/org.eclipse.buildship.oomph.test/lib/testng-6.13.1-sources.jar deleted file mode 100644 index 8636529b20..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/testng-6.13.1-sources.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/lib/testng-6.13.1.jar b/org.eclipse.buildship.oomph.test/lib/testng-6.13.1.jar deleted file mode 100644 index 3fd1a9db18..0000000000 Binary files a/org.eclipse.buildship.oomph.test/lib/testng-6.13.1.jar and /dev/null differ diff --git a/org.eclipse.buildship.oomph.test/src/main/groovy/org/eclipse/buildship/oomph/internal/test/fixtures/WorkspaceSpecification.groovy b/org.eclipse.buildship.oomph.test/src/main/groovy/org/eclipse/buildship/oomph/internal/test/fixtures/WorkspaceSpecification.groovy index 84b366f77b..5114c9c7e6 100644 --- a/org.eclipse.buildship.oomph.test/src/main/groovy/org/eclipse/buildship/oomph/internal/test/fixtures/WorkspaceSpecification.groovy +++ b/org.eclipse.buildship.oomph.test/src/main/groovy/org/eclipse/buildship/oomph/internal/test/fixtures/WorkspaceSpecification.groovy @@ -9,10 +9,9 @@ ******************************************************************************/ package org.eclipse.buildship.oomph.internal.test.fixtures -import org.junit.Rule -import org.junit.rules.TemporaryFolder import spock.lang.AutoCleanup import spock.lang.Specification +import spock.lang.TempDir import com.google.common.collect.ImmutableList import com.google.common.io.Files @@ -33,6 +32,7 @@ import org.eclipse.debug.core.ILaunchManager import org.eclipse.jdt.core.IJavaProject import org.eclipse.jdt.core.JavaCore +import org.eclipse.buildship.core.GradleDistribution import org.eclipse.buildship.core.internal.CorePlugin import org.eclipse.buildship.core.internal.configuration.BuildConfiguration import org.eclipse.buildship.core.internal.configuration.ConfigurationManager @@ -40,7 +40,6 @@ import org.eclipse.buildship.core.internal.launch.GradleRunConfigurationDelegate import org.eclipse.buildship.core.internal.marker.GradleErrorMarker import org.eclipse.buildship.core.internal.preferences.DefaultPersistentModel import org.eclipse.buildship.core.internal.preferences.PersistentModel -import org.eclipse.buildship.core.GradleDistribution import org.eclipse.buildship.core.internal.workspace.EclipseVmUtil import org.eclipse.buildship.core.internal.workspace.PersistentModelBuilder import org.eclipse.buildship.core.internal.workspace.WorkspaceOperations @@ -51,8 +50,8 @@ import org.eclipse.buildship.core.internal.workspace.WorkspaceOperations */ abstract class WorkspaceSpecification extends Specification { - @Rule - TemporaryFolder tempFolderProvider + @TempDir + File tempFolderProvider @AutoCleanup TestEnvironment environment = TestEnvironment.INSTANCE @@ -62,7 +61,7 @@ abstract class WorkspaceSpecification extends Specification { private LogCollector logCollector = new LogCollector() def setup() { - externalTestDir = tempFolderProvider.newFolder('external') + externalTestDir = new File(tempFolderProvider, 'external') Platform.addLogListener(logCollector) EclipseVmUtil.findOrRegisterVM("8", new File(System.getProperty("jdk8.location"))) EclipseVmUtil.findOrRegisterVM("11", new File(System.getProperty("jdk11.location")))