Skip to content

Commit bfd5ebb

Browse files
committed
Merge Gradle/Maven starter projects to reduce duplication
1 parent ed5ac99 commit bfd5ebb

File tree

12 files changed

+5
-84
lines changed

12 files changed

+5
-84
lines changed

platform-tooling-support-tests/projects/maven-starter/pom.xml renamed to platform-tooling-support-tests/projects/jupiter-starter/pom.xml

-18
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,6 @@
6363
</properties>
6464
</configuration>
6565
</plugin>
66-
<plugin>
67-
<groupId>org.codehaus.gmaven</groupId>
68-
<artifactId>groovy-maven-plugin</artifactId>
69-
<version>2.1.1</version>
70-
<executions>
71-
<execution>
72-
<phase>validate</phase>
73-
<goals>
74-
<goal>execute</goal>
75-
</goals>
76-
<configuration>
77-
<source>
78-
println("Using Java version: ${java.version}")
79-
</source>
80-
</configuration>
81-
</execution>
82-
</executions>
83-
</plugin>
8466
</plugins>
8567
</build>
8668

platform-tooling-support-tests/projects/maven-starter/src/main/java/com/example/project/Calculator.java

-19
This file was deleted.

platform-tooling-support-tests/projects/maven-starter/src/test/java/com/example/project/CalculatorTests.java

-41
This file was deleted.

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GradleStarterTests {
3535
@Test
3636
void gradle_wrapper(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles outputFiles) throws Exception {
3737
var result = ProcessStarters.gradlew() //
38-
.workingDir(copyToWorkspace(Projects.GRADLE_STARTER, workspace)) //
38+
.workingDir(copyToWorkspace(Projects.JUPITER_STARTER, workspace)) //
3939
.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
4040
.addArguments("build", "--no-daemon", "--stacktrace", "--no-build-cache", "--warning-mode=fail") //
4141
.putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) //

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ class MavenStarterTests {
3939
MavenRepoProxy mavenRepoProxy;
4040

4141
@Test
42-
void verifyMavenStarterProject(@TempDir Path workspace, @FilePrefix("maven") OutputFiles outputFiles)
42+
void verifyJupiterStarterProject(@TempDir Path workspace, @FilePrefix("maven") OutputFiles outputFiles)
4343
throws Exception {
4444
var result = ProcessStarters.maven(Helper.getJavaHome("8").orElseThrow(TestAbortedException::new)) //
45-
.workingDir(copyToWorkspace(Projects.MAVEN_STARTER, workspace)) //
45+
.workingDir(copyToWorkspace(Projects.JUPITER_STARTER, workspace)) //
4646
.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //
4747
.addArguments("-Dsnapshot.repo.url=" + mavenRepoProxy.getBaseUri()) //
4848
.addArguments("--update-snapshots", "--batch-mode", "verify") //

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/Projects.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@ public class Projects {
2121
public static final String GRAALVM_STARTER = "graalvm-starter";
2222
public static final String GRADLE_KOTLIN_EXTENSIONS = "gradle-kotlin-extensions";
2323
public static final String GRADLE_MISSING_ENGINE = "gradle-missing-engine";
24-
public static final String GRADLE_STARTER = "gradle-starter";
2524
public static final String JAR_DESCRIBE_MODULE = "jar-describe-module";
2625
public static final String JAVA_VERSIONS = "java-versions";
27-
public static final String MAVEN_STARTER = "maven-starter";
26+
public static final String JUPITER_STARTER = "jupiter-starter";
2827
public static final String MAVEN_SUREFIRE_COMPATIBILITY = "maven-surefire-compatibility";
2928
public static final String MULTI_RELEASE_JAR = "multi-release-jar";
3029
public static final String REFLECTION_TESTS = "reflection-tests";

platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/UnalignedClasspathTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class UnalignedClasspathTests {
4949
void verifyErrorMessageForUnalignedClasspath(JRE jre, Path javaHome, @TempDir Path workspace,
5050
@FilePrefix("maven") OutputFiles outputFiles) throws Exception {
5151
var starter = ProcessStarters.maven(javaHome) //
52-
.workingDir(copyToWorkspace(Projects.MAVEN_STARTER, workspace)) //
52+
.workingDir(copyToWorkspace(Projects.JUPITER_STARTER, workspace)) //
5353
.addArguments(localMavenRepo.toCliArgument(), "-Dmaven.repo=" + MavenRepo.dir()) //
5454
.addArguments("-Dsnapshot.repo.url=" + mavenRepoProxy.getBaseUri()) //
5555
.addArguments("-Djunit.platform.commons.version=1.11.4").addArguments("--update-snapshots",

0 commit comments

Comments
 (0)