You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2021/10/13 13:20:46 UTC
[maven-assembly-plugin] 01/01: Update plugin
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch update-plugin
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 84a5ffe233ceda5de44cd1db478363d04c6a6a1b
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Oct 13 15:19:58 2021 +0200
Update plugin
Set maven bits to proper scope, get rid of
ancient stuff, drop unused code and fix
test.
Added comments with questions and remarks in
POM.
---
pom.xml | 62 ++++++++++++++++------
.../artifact/DefaultDependencyResolverTest.java | 28 +++-------
2 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3a81111..91959b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@ under the License.
<mdoVersion>2.1.0</mdoVersion>
<mavenArchiverVersion>3.5.1</mavenArchiverVersion>
<mavenFilteringVersion>3.2.0</mavenFilteringVersion>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.2.5</mavenVersion>
<testOutputToFile>true</testOutputToFile>
<checkstyle.violation.ignore>RedundantThrows,NewlineAtEndOfFile,ParameterNumber,MethodLength,FileLength,ModifierOrder,JavadocMethod</checkstyle.violation.ignore>
<project.build.outputTimestamp>2020-04-27T17:26:57Z</project.build.outputTimestamp>
@@ -88,52 +88,61 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4</version>
</dependency>
+
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
- <version>3.0</version>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- <version>1.4.2</version>
+ <dependency> <!-- TODO: remove once org.apache.maven.repository.RepositorySystem moved out of maven-compat -->
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.1.1</version>
+ <version>3.1.1</version> <!-- TODO: Why does 3.2.0 NOT WORK??? -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-inject-plexus</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -150,6 +159,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -159,7 +169,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.2.1</version>
+ <version>4.2.5</version>
</dependency>
<dependency>
@@ -191,7 +201,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -231,6 +241,26 @@ under the License.
<artifactId>plexus-component-annotations</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency> <!-- TODO: this should be provided, but cannot be due MPLUGIN-372 -->
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <version>0.3.5</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ <version>3.2.6</version>
+ <classifier>no_aop</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.32</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
index 66e8ecb..da6acf6 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/artifact/DefaultDependencyResolverTest.java
@@ -32,21 +32,15 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.artifact.repository.LegacyLocalRepositoryManager;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
-import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Model;
-import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.model.DependencySet;
import org.apache.maven.plugins.assembly.model.ModuleBinaries;
import org.apache.maven.plugins.assembly.model.ModuleSet;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
public class DefaultDependencyResolverTest
@@ -63,23 +57,13 @@ public class DefaultDependencyResolverTest
resolver = (DefaultDependencyResolver) lookup( DependencyResolver.class );
}
-
- protected MavenSession newMavenSession( MavenProject project )
+
+ @Override
+ protected void customizeContainerConfiguration( @SuppressWarnings( "unused" ) final ContainerConfiguration configuration )
{
- MavenExecutionRequest request = new DefaultMavenExecutionRequest();
- MavenExecutionResult result = new DefaultMavenExecutionResult();
-
- MavenRepositorySystemSession repoSession = new MavenRepositorySystemSession();
-
- repoSession.setLocalRepositoryManager( LegacyLocalRepositoryManager.wrap( new StubArtifactRepository( "target/local-repo" ),
- null ) );
- MavenSession session = new MavenSession( getContainer(), repoSession, request, result );
- session.setCurrentProject( project );
- session.setProjects( Arrays.asList( project ) );
- return session;
+ configuration.setAutoWiring( true ).setClassPathScanning( PlexusConstants.SCANNING_INDEX );
}
-
public void test_getDependencySetResolutionRequirements_transitive()
throws DependencyResolutionException
{