Merge pull request #340 from flowlogix/local-resolver

[SHRINKRES-351] enh: Update components resulted from project-local resolution
shrinkwrap · Oct 15, 2024 · 953b648 · 953b648
2 parents d4cdfaf + 7a4a847
commit 953b648
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 112 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
         # https://api.adoptium.net/v3/info/available_releases
         # To list the available releases for a given "feature version" (example for 16):
         # https://api.adoptium.net/v3/assets/latest/16/hotspot
-        java: [8, 11]
+        java: [8, 11, 17]
 
     name: Build with JDK ${{ matrix.java }}
 

diff --git a/maven/impl-maven-archive/pom.xml b/maven/impl-maven-archive/pom.xml
@@ -58,16 +58,17 @@
                     <groupId>org.codehaus.plexus</groupId>
                     <artifactId>plexus-classworlds</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-component-annotations</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>javax.enterprise</groupId>
                     <artifactId>cdi-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>${version.com.google.guice}</version>
+        </dependency>
 
 
         <dependency>

diff --git a/...rg/jboss/shrinkwrap/resolver/impl/maven/archive/packaging/AbstractCompilingProcessor.java b/...rg/jboss/shrinkwrap/resolver/impl/maven/archive/packaging/AbstractCompilingProcessor.java
@@ -22,11 +22,15 @@
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
+import com.google.inject.Guice;
 import org.codehaus.plexus.compiler.CompilerConfiguration;
 import org.codehaus.plexus.compiler.CompilerException;
 import org.codehaus.plexus.compiler.CompilerMessage;
 import org.codehaus.plexus.compiler.CompilerResult;
 import org.codehaus.plexus.compiler.javac.JavacCompiler;
+import org.eclipse.sisu.space.SpaceModule;
+import org.eclipse.sisu.space.URLClassSpace;
+import org.eclipse.sisu.wire.WireModule;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenWorkingSession;
@@ -38,6 +42,7 @@
 import org.jboss.shrinkwrap.resolver.impl.maven.task.AddScopedDependenciesTask;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.Validate;
 import org.jboss.shrinkwrap.resolver.spi.maven.archive.packaging.PackagingProcessor;
+import static org.eclipse.sisu.space.SpaceModule.LOCAL_INDEX;
 
 /**
  * Packaging processor which is able to compile Java sources
@@ -63,7 +68,9 @@ protected PackagingProcessor<ARCHIVETYPE> configure(MavenWorkingSession session)
         if (skipCompilation) {
             log.fine("Compilation was skipped due to system property org.jboss.shrinkwrap.resolver.maven.importer.skipCompilation being set to true");
         } else {
-            compiler = new JavacCompiler();
+            compiler = Guice.createInjector(new WireModule(
+                    new SpaceModule(new URLClassSpace(AbstractCompilingProcessor.class.getClassLoader()),
+                            LOCAL_INDEX, true))).getInstance(JavacCompiler.class);
         }
         return this;
     }

diff --git a/...s/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfigurationTestCase.java b/...s/shrinkwrap/resolver/impl/maven/archive/plugins/CompilerPluginConfigurationTestCase.java
@@ -44,7 +44,7 @@ void additionalCompilerArgs() {
         CompilerPluginConfiguration configuration = new CompilerPluginConfiguration(session.getParsedPomFile());
         CompilerConfiguration compilerConf = configuration.asCompilerConfiguration();
         compilerConf.setOutputLocation("target");
-        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0]);
+        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0], compilerConf.getSourceVersion());
 
         assertThat(Arrays.asList(args),
             hasItems("-verbose", "-Xlint:unchecked", "-Xlint:cast", "-source", "1.7"));
@@ -59,7 +59,7 @@ void compilerEncoding() {
         CompilerPluginConfiguration configuration = new CompilerPluginConfiguration(session.getParsedPomFile());
         CompilerConfiguration compilerConf = configuration.asCompilerConfiguration();
         compilerConf.setOutputLocation("target");
-        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0]);
+        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0], compilerConf.getSourceVersion());
 
         assertThat(Arrays.asList(args),
             hasItems("-verbose", "-Xlint:unchecked", "-Xlint:cast", "-source", "1.7", "-encoding", "ISO-8859-2"));
@@ -74,7 +74,7 @@ void compilerEncodingFromProperty() {
         CompilerPluginConfiguration configuration = new CompilerPluginConfiguration(session.getParsedPomFile());
         CompilerConfiguration compilerConf = configuration.asCompilerConfiguration();
         compilerConf.setOutputLocation("target");
-        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0]);
+        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0], compilerConf.getSourceVersion());
 
         assertThat(Arrays.asList(args),
             hasItems("-verbose", "-Xlint:unchecked", "-Xlint:cast", "-source", "1.7", "-encoding", "ISO-8859-2"));

diff --git a/.../jboss/shrinkwrap/resolver/impl/maven/archive/plugins/JarPluginConfigurationTestCase.java b/.../jboss/shrinkwrap/resolver/impl/maven/archive/plugins/JarPluginConfigurationTestCase.java
@@ -40,7 +40,7 @@ void additionalCompilerArguments() {
         CompilerPluginConfiguration configuration = new CompilerPluginConfiguration(session.getParsedPomFile());
         CompilerConfiguration compilerConf = configuration.asCompilerConfiguration();
         compilerConf.setOutputLocation("target");
-        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0]);
+        String[] args = JavacCompiler.buildCompilerArguments(compilerConf, new String[0], compilerConf.getSourceVersion());
 
 
 

diff --git a/maven/impl-maven-embedded/pom.xml b/maven/impl-maven-embedded/pom.xml
@@ -33,6 +33,11 @@
             <artifactId>maven-invoker</artifactId>
             <version>${version.org.apache.maven-invoker}</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

diff --git a/...mbedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/BuildTrigger.java b/...mbedded/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/BuildTrigger.java
@@ -39,10 +39,7 @@ private void setOutputHandlers(String expectedRegex, CountDownLatch countDownLat
                 new ResolverErrorOutputHandler(logBuffer, expectedRegex, countDownLatch);
             ResolverOutputHandler outputHandler = new ResolverOutputHandler(logBuffer, expectedRegex, countDownLatch);
 
-            invoker.setOutputHandler(outputHandler);
             invocationRequest.setOutputHandler(outputHandler);
-
-            invoker.setErrorHandler(errorOutputHandler);
             invocationRequest.setErrorHandler(errorOutputHandler);
 
             errorOutputHandler.setQuiet(quiet);
@@ -54,7 +51,7 @@ public BuiltProject build(String expectedRegex, CountDownLatch countDownLatch) {
         final String oldValue = removeSAXParserFactoryProperty();
 
         if (mavenInstallation != null) {
-            invoker.setMavenHome(mavenInstallation);
+            invocationRequest.setMavenHome(mavenInstallation);
         }
 
         setOutputHandlers(expectedRegex, countDownLatch);

diff --git a/...rg/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/ConfigurationStageImpl.java b/...rg/jboss/shrinkwrap/resolver/impl/maven/embedded/pom/equipped/ConfigurationStageImpl.java
@@ -81,13 +81,11 @@ public ConfigurationDistributionStage setLogger(InvokerLogger invokerLogger) {
     @Override
     public ConfigurationDistributionStage setWorkingDirectory(File workingDirectory) {
         getInvocationRequest().setBaseDirectory(workingDirectory);
-        getInvoker().setWorkingDirectory(workingDirectory);
         return this;
     }
 
     @Override
     public ConfigurationDistributionStage setInputStream(InputStream inputStream) {
-        getInvoker().setInputStream(inputStream);
         getInvocationRequest().setInputStream(inputStream);
         return this;
     }

diff --git a/...st/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/ConfigurationStageTestCase.java b/...st/java/org/jboss/shrinkwrap/resolver/impl/maven/embedded/ConfigurationStageTestCase.java
@@ -109,7 +109,7 @@ void runTest() {
 
         softly.assertThat(invoker.getLogger()).isEqualTo(invokerLogger);
         softly.assertThat(invoker.getLocalRepositoryDirectory()).isEqualTo(localRepositoryDirectory);
-        softly.assertThat(invoker.getWorkingDirectory()).isEqualTo(workingDirectory);
+        softly.assertThat(invocationRequest.getBaseDirectory()).isEqualTo(workingDirectory);
         softly.assertThat(invoker.getLogger().getThreshold()).isEqualTo(InvokerLogger.DEBUG);
 
         boolean hasFailed = false;
@@ -122,8 +122,8 @@ void runTest() {
             Assertions.fail("Maven build execution should fail as the local repository location is NOT a directory");
         }
 
-        softly.assertThat(invoker.getMavenHome()).isNotNull();
-        softly.assertThat(invoker.getMavenHome().getName()).isEqualTo("apache-maven-3.3.9");
+        softly.assertThat(invocationRequest.getMavenHome()).isNotNull();
+        softly.assertThat(invocationRequest.getMavenHome().getName()).isEqualTo("apache-maven-3.3.9");
     }
 
     private ConfigurationStageImpl getConfigurationStageImpl(File jarSamplePom) {

diff --git a/...solver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForJarSampleTestCase.java b/...solver/impl/maven/embedded/pom/equipped/PomEquippedEmbeddedMavenForJarSampleTestCase.java
@@ -51,7 +51,7 @@ void testJarSampleBuildWithDebugLoggerLevelShouldDisplayCommand() {
             .build();
 
         final String logOutput = logOutputStream.toString();
-        Assertions.assertThat(logOutput).contains("[DEBUG] Using ${maven.home} of:");
+        Assertions.assertThat(logOutput).contains("[DEBUG] Using maven.home of:");
         final String expectedExecPattern = System.getProperty("os.name").startsWith("Windows")
             ? "\\[DEBUG\\] Executing: cmd.exe /X /C .+bin\\\\mvn.+skipTests=true.+clean.+verify"
             : "\\[DEBUG\\] Executing: /bin/sh -c cd .+jar-sample.+bin/mvn.+skipTests=true.+clean.+verify";

diff --git a/maven/impl-maven/pom.xml b/maven/impl-maven/pom.xml
@@ -67,26 +67,22 @@
             <artifactId>plexus-classworlds</artifactId>
             <version>${version.org.codehaus.plexus-classworlds}</version>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-component-annotations</artifactId>
-            <version>${version.org.codehaus.plexus-component-annotations}</version>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.sisu</groupId>
             <artifactId>org.eclipse.sisu.plexus</artifactId>
             <version>${version.org.eclipse.plexus}</version> <!-- Note: older version imported from Maven parent, but use latest -->
             <exclusions>
-                <exclusion>
-                    <groupId>org.codehaus.plexus</groupId>
-                    <artifactId>plexus-component-annotations</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.codehaus.plexus</groupId>
                     <artifactId>plexus-classworlds</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>${version.org.eclipse.plexus}</version>
+        </dependency>
         <!-- Sisu Inject/Plexus leaves to user to "bring in" Guice: runtime needed only -->
         <dependency>
             <groupId>com.google.inject</groupId>
@@ -298,7 +294,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <additionalClasspathElements>
+                    <additionalClasspathElements combine.children="append">
                         <additionalClasspathElement>${appended.jar.for.test}</additionalClasspathElement>
                     </additionalClasspathElements>
                 </configuration>

diff --git a/...n/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/logging/AetherLoggerFactory.java b/...n/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/logging/AetherLoggerFactory.java
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-parent</artifactId>
-        <version>39</version>
+        <version>46</version>
     </parent>
 
     <!-- Model Information -->
@@ -28,21 +28,21 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.argument.target>1.8</maven.compiler.argument.target>
         <maven.compiler.argument.source>1.8</maven.compiler.argument.source>
+        <version.checkstyle>9.3</version.checkstyle>
 
         <!-- Versioning -->
-        <version.com.google.guice>7.0.0</version.com.google.guice>
+        <version.com.google.guice>6.0.0</version.com.google.guice>
         <version.commons-codec>1.17.1</version.commons-codec>
         <version.commons-compress>1.27.1</version.commons-compress>
         <version.commons-io>2.17.0</version.commons-io>
         <version.eu.maveniverse.mima>2.4.20</version.eu.maveniverse.mima>
         <version.org.apache.maven>3.9.9</version.org.apache.maven>
         <version.org.apache.maven-plugin-annotations>3.15.0</version.org.apache.maven-plugin-annotations>
-        <version.org.apache.maven-invoker>3.0.1</version.org.apache.maven-invoker>
+        <version.org.apache.maven-invoker>3.3.0</version.org.apache.maven-invoker>
         <version.org.codehaus.plexus-classworlds>2.8.0</version.org.codehaus.plexus-classworlds>
-        <version.org.codehaus.plexus-compiler-javac>2.7</version.org.codehaus.plexus-compiler-javac>
-        <version.org.codehaus.plexus-component-annotations>2.2.0</version.org.codehaus.plexus-component-annotations>
+        <version.org.codehaus.plexus-compiler-javac>2.15.0</version.org.codehaus.plexus-compiler-javac>
         <version.org.codehaus.plexus-sec-dispatcher>2.0</version.org.codehaus.plexus-sec-dispatcher>
-        <version.org.eclipse.plexus>0.3.5</version.org.eclipse.plexus>
+        <version.org.eclipse.plexus>0.9.0.M3</version.org.eclipse.plexus>
         <version.org.gradle.gradle-tooling-api>8.10.2</version.org.gradle.gradle-tooling-api>
         <version.org.jboss.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap>
 
@@ -131,6 +131,11 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>${version.com.google.guice}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>