You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:14:41 UTC
[maven-dependency-plugin] branch mvn4 created (now e3a9a40)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git.
at e3a9a40 mvn4 aggregator
This branch includes the following new commits:
new e3a9a40 mvn4 aggregator
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-dependency-plugin] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit e3a9a40a8f05127c58836eec8c1aa6a6001c352f
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:14:39 2022 +0100
mvn4 aggregator
---
pom.xml | 65 ++++++----------------
src/it/projects/analyze-dep-mgt/pom.xml | 4 +-
src/it/projects/analyze-ignore-dependency/pom.xml | 4 +-
.../dependency/analyze/AbstractAnalyzeMojo.java | 7 +--
.../translators/TestClassifierTypeTranslator.java | 15 +++--
5 files changed, 32 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
index 49782bd..256c818 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,11 +89,11 @@ under the License.
</contributors>
<properties>
- <mavenVersion>3.1.1</mavenVersion>
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
<jettyVersion>9.4.41.v20210516</jettyVersion>
- <pluginTestingVersion>3.1.0</pluginTestingVersion>
+ <pluginTestingVersion>3.4.0-SNAPSHOT</pluginTestingVersion>
<javaVersion>8</javaVersion>
<mavenPluginToolsVersion>3.6.2</mavenPluginToolsVersion>
<project.build.outputTimestamp>2021-06-07T12:17:08Z</project.build.outputTimestamp>
@@ -149,7 +149,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-aether-provider</artifactId>
+ <artifactId>maven-resolver-provider</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
@@ -158,19 +158,15 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
- <artifactId>maven-artifact-manager</artifactId>
- <groupId>org.apache.maven</groupId>
- </exclusion>
- <exclusion>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-compat</artifactId>
<groupId>org.apache.maven</groupId>
</exclusion>
<exclusion>
@@ -227,33 +223,27 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-analyzer</artifactId>
- <version>1.11.3</version>
- <exclusions>
- <exclusion>
- <artifactId>maven-project</artifactId>
- <groupId>org.apache.maven</groupId>
- </exclusion>
- </exclusions>
+ <version>1.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
- <version>3.1.0</version>
+ <version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.13.1</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -279,26 +269,13 @@ under the License.
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>0.9.0.M2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
- <version>0.9.0.M2</version>
- <scope>provided</scope>
- </dependency>
+
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
- <version>0.9.0.M2</version>
- <scope>provided</scope>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-lightweight</artifactId>
@@ -315,12 +292,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
- <artifactId>maven-plugin-testing-tools</artifactId>
- <version>${pluginTestingVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>${pluginTestingVersion}</version>
<scope>test</scope>
diff --git a/src/it/projects/analyze-dep-mgt/pom.xml b/src/it/projects/analyze-dep-mgt/pom.xml
index 21cb3e5..62c3348 100644
--- a/src/it/projects/analyze-dep-mgt/pom.xml
+++ b/src/it/projects/analyze-dep-mgt/pom.xml
@@ -49,8 +49,8 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.6</version>
+ <artifactId>maven-compat</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
diff --git a/src/it/projects/analyze-ignore-dependency/pom.xml b/src/it/projects/analyze-ignore-dependency/pom.xml
index bc43ff5..f881c1b 100644
--- a/src/it/projects/analyze-ignore-dependency/pom.xml
+++ b/src/it/projects/analyze-ignore-dependency/pom.xml
@@ -39,8 +39,8 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0.6</version>
+ <artifactId>maven-core</artifactId>
+ <version>4.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
index 98c9a69..e011d4e 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/analyze/AbstractAnalyzeMojo.java
@@ -277,19 +277,18 @@ public abstract class AbstractAnalyzeMojo
throws MojoExecutionException
{
- final String role = ProjectDependencyAnalyzer.ROLE;
final String roleHint = analyzer;
try
{
final PlexusContainer container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
- return (ProjectDependencyAnalyzer) container.lookup( role, roleHint );
+ return container.lookup( ProjectDependencyAnalyzer.class, roleHint );
}
catch ( Exception exception )
{
- throw new MojoExecutionException( "Failed to instantiate ProjectDependencyAnalyser with role " + role
- + " / role-hint " + roleHint, exception );
+ throw new MojoExecutionException( "Failed to instantiate ProjectDependencyAnalyser with role-hint "
+ + roleHint, exception );
}
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
index 1bbf0db..23c355b 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
@@ -35,7 +35,6 @@ import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.SilentLog;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
@@ -48,9 +47,9 @@ public class TestClassifierTypeTranslator
{
Set<Artifact> artifacts = new HashSet<>();
- ArtifactFactory artifactFactory;
+// ArtifactFactory artifactFactory;
- ArtifactRepository artifactRepository;
+// ArtifactRepository artifactRepository;
Log log = new SilentLog();
@@ -62,13 +61,13 @@ public class TestClassifierTypeTranslator
{
super.setUp( "classifiertype-translator", false );
- artifactHandlerManager = new DefaultArtifactHandlerManager();
- this.setVariableValueToObject( artifactHandlerManager, "artifactHandlers", new HashMap<>() );
+ artifactHandlerManager = new DefaultArtifactHandlerManager( new HashMap<>() );
+// this.setVariableValueToObject( artifactHandlerManager, "artifactHandlers", new HashMap<>() );
- artifactFactory = new DefaultArtifactFactory();
- this.setVariableValueToObject( artifactFactory, "artifactHandlerManager", artifactHandlerManager );
+// artifactFactory = new DefaultArtifactFactory();
+// this.setVariableValueToObject( artifactFactory, "artifactHandlerManager", artifactHandlerManager );
- artifactRepository = new StubArtifactRepository( null );
+// artifactRepository = new StubArtifactRepository( null );
DependencyArtifactStubFactory factory = new DependencyArtifactStubFactory( null, false );
artifacts = factory.getMixedArtifacts();