Slight updates

takari · Jul 8, 2024 · 94bf275 · 94bf275
1 parent c655e4d
commit 94bf275
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>io.takari</groupId>
     <artifactId>takari</artifactId>
-    <version>53</version>
+    <version>55</version>
   </parent>
 
   <groupId>io.takari.maven.plugins</groupId>
@@ -36,10 +36,10 @@
   </scm>
 
   <properties>
-    <mavenVersion>3.9.6</mavenVersion>
-    <sisuVersion>0.9.0.M2</sisuVersion>
+    <mavenVersion>3.9.8</mavenVersion>
+    <sisuVersion>0.9.0.M3</sisuVersion>
     <sisuGuiceVersion>6.0.0</sisuGuiceVersion>
-    <aetherVersion>1.9.18</aetherVersion>
+    <aetherVersion>1.9.21</aetherVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
   </properties>
 
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.2</version>
+        <version>5.10.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -62,6 +62,16 @@
         <artifactId>plexus-utils</artifactId>
         <version>3.5.1</version>
       </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.7.36</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>1.7.36</version>
+      </dependency>
 
       <!-- unit testing -->
       <dependency>
@@ -138,6 +148,7 @@
       </dependency>
 
       <!-- automatic resolution of maven runtimes during integration tests -->
+      <!-- Note: this compress must work with commons-io in Maven: 1.26.1 requires Maven 3.8! -->
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>

diff --git a/takari-plugin-integration-testing/pom.xml b/takari-plugin-integration-testing/pom.xml
@@ -45,7 +45,6 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
     </dependency>
-
   </dependencies>
 
 </project>
diff --git a/takari-plugin-testing-its/pom.xml b/takari-plugin-testing-its/pom.xml
@@ -109,6 +109,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.7.1</version>
         <executions>
           <execution>
             <id>unpack</id>
@@ -117,7 +118,7 @@
             </goals>
             <phase>generate-test-resources</phase>
             <configuration>
-              <outputDirectory>${project.build.directory}</outputDirectory>
+              <outputDirectory>${project.build.directory}/maven-installation</outputDirectory>
               <artifactItems>
                 <artifactItem>
                   <groupId>org.apache.maven</groupId>
@@ -136,7 +137,7 @@
                 <artifactItem>
                   <groupId>org.apache.maven</groupId>
                   <artifactId>apache-maven</artifactId>
-                  <version>3.9.6</version>
+                  <version>3.9.8</version>
                   <classifier>bin</classifier>
                   <type>tar.gz</type>
                 </artifactItem>

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
@@ -33,7 +33,7 @@ public static List<Object[]> versions() {
         List<Object[]> parameters = new ArrayList<>();
         parameters.add(new Object[] {"3.6.3"});
         parameters.add(new Object[] {"3.8.8"});
-        parameters.add(new Object[] {"3.9.6"});
+        parameters.add(new Object[] {"3.9.8"});
         return parameters;
     }
 
@@ -46,7 +46,7 @@ public static List<Object[]> versions() {
 
     public IntegrationTest(String version) throws Exception {
         this.version = version;
-        File mavenHome = new File("target/apache-maven-" + version);
+        File mavenHome = new File("target/maven-installation/apache-maven-" + version);
         this.maven = MavenRuntime.builder(mavenHome, null).forkedBuilder().build();
     }
 

diff --git a/...plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5IntegrationTests.java b/...plugin-testing-its/src/test/java/io/takari/maven/testing/test/JUnit5IntegrationTests.java
@@ -13,7 +13,11 @@
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-@MavenInstallations({"target/apache-maven-3.6.3", "target/apache-maven-3.8.8", "target/apache-maven-3.9.6"})
+@MavenInstallations({
+    "target/maven-installation/apache-maven-3.6.3",
+    "target/maven-installation/apache-maven-3.8.8",
+    "target/maven-installation/apache-maven-3.9.8"
+})
 public class JUnit5IntegrationTests {
 
     @RegisterExtension
@@ -36,7 +40,8 @@ void testBasic() throws Exception {
                 "package basic; class TargetVersion { static final String VERSION = \"" + this.version + "\"; }");
 
         this.maven
-                .forProject(basedir) //
+                .forProject(basedir)
+                .withCliOption("-e") //
                 .execute("package") //
                 .assertErrorFreeLog();
     }

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
@@ -86,15 +86,15 @@ void testUnitTestHarnessHonoursUserSettings(MavenRuntime maven, String version)
     static final class MavenVersionsSource implements ArgumentsProvider {
 
         private List<String> getMavenVersions() {
-            return Arrays.asList("3.6.3", "3.8.8", "3.9.6");
+            return Arrays.asList("3.6.3", "3.8.8", "3.9.8");
         }
 
         @Override
         public Stream<? extends Arguments> provideArguments(ExtensionContext context) throws Exception {
             List<String> mavenVersions = this.getMavenVersions();
             List<Arguments> arguments = new ArrayList<>(mavenVersions.size());
             for (String version : mavenVersions) {
-                File mavenHome = new File("target/apache-maven-" + version);
+                File mavenHome = new File("target/maven-installation/apache-maven-" + version);
                 MavenRuntime maven =
                         MavenRuntime.builder(mavenHome, null).forkedBuilder().build();
                 arguments.add(Arguments.of(maven, version));

diff --git a/takari-plugin-testing-its/src/test/projects/basic/src/test/java/basic/IntegrationTest.java b/takari-plugin-testing-its/src/test/projects/basic/src/test/java/basic/IntegrationTest.java
@@ -28,7 +28,7 @@ public IntegrationTest(MavenRuntimeBuilder builder) throws Exception {
   @Test
   public void testBasic() throws Exception {
     File basedir = resources.getBasedir("basic");
-    maven.forProject(basedir).execute("validate").assertErrorFreeLog();
+    maven.forProject(basedir).withCliOptions("-e").execute("validate").assertErrorFreeLog();
     TestResources.assertFilesPresent(basedir, "target/output.txt");
   }
 

diff --git a/takari-plugin-testing/pom.xml b/takari-plugin-testing/pom.xml
@@ -34,6 +34,15 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- unit testing -->
     <dependency>
@@ -111,5 +120,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/takari-plugin-testing/src/main/java/io/takari/maven/testing/executor/MavenRuntime.java b/takari-plugin-testing/src/main/java/io/takari/maven/testing/executor/MavenRuntime.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 public class MavenRuntime {
-
     private final MavenLauncher launcher;
 
     private final TestProperties properties;
@@ -30,6 +29,8 @@ public static class MavenRuntimeBuilder {
 
         protected final File mavenHome;
 
+        protected final String mavenVersion;
+
         protected final File classworldsConf;
 
         protected final List<String> extensions = new ArrayList<>();
@@ -39,6 +40,7 @@ public static class MavenRuntimeBuilder {
         MavenRuntimeBuilder(File mavenHome, File classworldsConf) {
             this.properties = new TestProperties();
             this.mavenHome = mavenHome;
+            this.mavenVersion = MavenInstallationUtils.getMavenVersion(mavenHome, classworldsConf);
             this.classworldsConf = classworldsConf;
 
             StringBuilder workspaceState = new StringBuilder();
@@ -47,7 +49,7 @@ public static class MavenRuntimeBuilder {
 
             String workspaceResolver = properties.get("workspaceResolver");
             if (workspaceState.length() > 0 && isFile(workspaceResolver)) {
-                if ("3.2.1".equals(MavenInstallationUtils.getMavenVersion(mavenHome, classworldsConf))) {
+                if ("3.2.1".equals(mavenVersion)) {
                     throw new IllegalArgumentException(
                             "Maven 3.2.1 is not supported, see https://jira.codehaus.org/browse/MNG-5591");
                 }
@@ -72,6 +74,7 @@ private void appendLocation(StringBuilder workspaceState, String location) {
         MavenRuntimeBuilder(File mavenHome, File classworldsConf, List<String> extensions, List<String> args) {
             this.properties = new TestProperties();
             this.mavenHome = mavenHome;
+            this.mavenVersion = MavenInstallationUtils.getMavenVersion(mavenHome, classworldsConf);
             this.classworldsConf = classworldsConf;
             this.extensions.addAll(extensions);
             this.args.addAll(args);

diff --git a/...in-testing/src/main/java/io/takari/maven/testing/executor/junit/MavenVersionResolver.java b/...in-testing/src/main/java/io/takari/maven/testing/executor/junit/MavenVersionResolver.java
@@ -91,15 +91,15 @@ public void resolve(String[] versions) throws Exception {
                         "Cannot test %s plugin release with %s maven", properties.getPluginVersion(), version);
                 error(version, new IllegalStateException(msg));
             }
-            File basdir = new File("target/maven-installation").getCanonicalFile();
-            File mavenHome = new File(basdir, "apache-maven-" + version).getCanonicalFile();
+            File basedir = new File("target/maven-installation").getCanonicalFile();
+            File mavenHome = new File(basedir, "apache-maven-" + version).getCanonicalFile();
             if (!mavenHome.isDirectory()) {
                 if (repositories == null) {
                     repositories = getRepositories(properties);
                 }
                 Authenticator defaultAuthenticator = getDefaultAuthenticator();
                 try {
-                    createMavenInstallation(repositories, version, properties.getLocalRepository(), basdir);
+                    createMavenInstallation(repositories, version, properties.getLocalRepository(), basedir);
                 } catch (Exception e) {
                     error(version, e);
                 } finally {