Merge Gradle/Maven starter projects to reduce duplication

junit-team · Feb 9, 2025 · bfd5ebb · bfd5ebb
1 parent ed5ac99
commit bfd5ebb
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 84 deletions.
diff --git a/.../projects/gradle-starter/build.gradle.kts → ...projects/jupiter-starter/build.gradle.kts b/.../projects/gradle-starter/build.gradle.kts → ...projects/jupiter-starter/build.gradle.kts
diff --git a/...projects/gradle-starter/gradle.properties → ...rojects/jupiter-starter/gradle.properties b/...projects/gradle-starter/gradle.properties → ...rojects/jupiter-starter/gradle.properties
diff --git a/...port-tests/projects/maven-starter/pom.xml → ...rt-tests/projects/jupiter-starter/pom.xml b/...port-tests/projects/maven-starter/pom.xml → ...rt-tests/projects/jupiter-starter/pom.xml
@@ -63,24 +63,6 @@
                     </properties>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <version>2.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                println("Using Java version: ${java.version}")
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/...ojects/gradle-starter/settings.gradle.kts → ...jects/jupiter-starter/settings.gradle.kts b/...ojects/gradle-starter/settings.gradle.kts → ...jects/jupiter-starter/settings.gradle.kts
diff --git a/.../java/com/example/project/Calculator.java → .../java/com/example/project/Calculator.java b/.../java/com/example/project/Calculator.java → .../java/com/example/project/Calculator.java
diff --git a/.../com/example/project/CalculatorTests.java → .../com/example/project/CalculatorTests.java b/.../com/example/project/CalculatorTests.java → .../com/example/project/CalculatorTests.java
diff --git a/...ng-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java b/...ng-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java
diff --git a/...pport-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java b/...pport-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java
diff --git a/...ooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/...ooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java
@@ -35,7 +35,7 @@ class GradleStarterTests {
 	@Test
 	void gradle_wrapper(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles outputFiles) throws Exception {
 		var result = ProcessStarters.gradlew() //
-				.workingDir(copyToWorkspace(Projects.GRADLE_STARTER, workspace)) //
+				.workingDir(copyToWorkspace(Projects.JUPITER_STARTER, workspace)) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
 				.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //

diff --git a/...tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/...tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java
@@ -39,10 +39,10 @@ class MavenStarterTests {
 	MavenRepoProxy mavenRepoProxy;
 
 	@Test
-	void verifyMavenStarterProject(@TempDir Path workspace, @FilePrefix("maven") OutputFiles outputFiles)
+	void verifyJupiterStarterProject(@TempDir Path workspace, @FilePrefix("maven") OutputFiles outputFiles)
 			throws Exception {
 		var result = ProcessStarters.maven(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
-				.workingDir(copyToWorkspace(Projects.MAVEN_STARTER, workspace)) //
+				.workingDir(copyToWorkspace(Projects.JUPITER_STARTER, workspace)) //
 				.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Dsnapshot.repo.url=" + mavenRepoProxy.getBaseUri()) //
 				.addArguments("--update-snapshots", "--batch-mode", "verify") //

diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/Projects.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/Projects.java
@@ -21,10 +21,9 @@ public class Projects {
 	public static final String GRAALVM_STARTER = "graalvm-starter";
 	public static final String GRADLE_KOTLIN_EXTENSIONS = "gradle-kotlin-extensions";
 	public static final String GRADLE_MISSING_ENGINE = "gradle-missing-engine";
-	public static final String GRADLE_STARTER = "gradle-starter";
 	public static final String JAR_DESCRIBE_MODULE = "jar-describe-module";
 	public static final String JAVA_VERSIONS = "java-versions";
-	public static final String MAVEN_STARTER = "maven-starter";
+	public static final String JUPITER_STARTER = "jupiter-starter";
 	public static final String MAVEN_SUREFIRE_COMPATIBILITY = "maven-surefire-compatibility";
 	public static final String MULTI_RELEASE_JAR = "multi-release-jar";
 	public static final String REFLECTION_TESTS = "reflection-tests";

diff --git a/...g-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java b/...g-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java
@@ -49,7 +49,7 @@ class UnalignedClasspathTests {
 	void verifyErrorMessageForUnalignedClasspath(JRE jre, Path javaHome, @TempDir Path workspace,
 			@FilePrefix("maven") OutputFiles outputFiles) throws Exception {
 		var starter = ProcessStarters.maven(javaHome) //
-				.workingDir(copyToWorkspace(Projects.MAVEN_STARTER, workspace)) //
+				.workingDir(copyToWorkspace(Projects.JUPITER_STARTER, workspace)) //
 				.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("-Dsnapshot.repo.url=" + mavenRepoProxy.getBaseUri()) //
 				.addArguments("-Djunit.platform.commons.version=1.11.4").addArguments("--update-snapshots",