diff --git a/takari-plugin-testing-its/pom.xml b/takari-plugin-testing-its/pom.xml index 9ac2be2..2bc040b 100644 --- a/takari-plugin-testing-its/pom.xml +++ b/takari-plugin-testing-its/pom.xml @@ -109,7 +109,6 @@ org.apache.maven.plugins maven-dependency-plugin - 3.3.0 unpack @@ -127,6 +126,20 @@ bin tar.gz + + org.apache.maven + apache-maven + 3.8.8 + bin + tar.gz + + + org.apache.maven + apache-maven + 3.9.6 + bin + tar.gz + diff --git a/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/IntegrationTest.java b/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/IntegrationTest.java index 8108004..62967a8 100644 --- a/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/IntegrationTest.java +++ b/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/IntegrationTest.java @@ -32,6 +32,8 @@ public class IntegrationTest { public static List versions() { List parameters = new ArrayList<>(); parameters.add(new Object[] {"3.6.3"}); + parameters.add(new Object[] {"3.8.8"}); + parameters.add(new Object[] {"3.9.6"}); return parameters; } @@ -44,7 +46,7 @@ public static List versions() { public IntegrationTest(String version) throws Exception { this.version = version; - File mavenHome = new File("target/apache-maven-3.6.3"); + File mavenHome = new File("target/apache-maven-" + version); this.maven = MavenRuntime.builder(mavenHome, null).forkedBuilder().build(); } diff --git a/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5IntegrationTests.java b/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5IntegrationTests.java index e4c3ae4..8a43caa 100644 --- a/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5IntegrationTests.java +++ b/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5IntegrationTests.java @@ -6,7 +6,6 @@ import io.takari.maven.testing.executor.MavenInstallations; import io.takari.maven.testing.executor.MavenRuntime; import io.takari.maven.testing.executor.MavenRuntime.MavenRuntimeBuilder; -import io.takari.maven.testing.executor.MavenVersions; import io.takari.maven.testing.executor.junit.MavenPluginTest; import java.io.File; import java.io.IOException; @@ -14,8 +13,7 @@ import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.extension.RegisterExtension; -@MavenVersions("3.8.4") -@MavenInstallations("target/apache-maven-3.6.3") +@MavenInstallations({"target/apache-maven-3.6.3", "target/apache-maven-3.8.8", "target/apache-maven-3.9.6"}) public class JUnit5IntegrationTests { @RegisterExtension diff --git a/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5UnitTests.java b/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5UnitTests.java index ea814f8..6a0bd23 100644 --- a/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5UnitTests.java +++ b/takari-plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5UnitTests.java @@ -9,7 +9,7 @@ import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; -import java.util.Collections; +import java.util.Arrays; import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.extension.ExtensionContext; @@ -86,7 +86,7 @@ void testUnitTestHarnessHonoursUserSettings(MavenRuntime maven, String version) static final class MavenVersionsSource implements ArgumentsProvider { private List getMavenVersions() { - return Collections.singletonList("3.6.3"); + return Arrays.asList("3.6.3", "3.8.8", "3.9.6"); } @Override