You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2024/04/23 19:36:19 UTC
(maven-dependency-plugin) branch master updated: [MDEP-925] Require Maven 3.6.3
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new fda11843 [MDEP-925] Require Maven 3.6.3
fda11843 is described below
commit fda11843f7c48d524d92918ff2a79fbee259d2fc
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Apr 23 00:05:20 2024 +0200
[MDEP-925] Require Maven 3.6.3
---
pom.xml | 31 ++++++++++++----------
.../dependency/AbstractDependencyMojoTest.java | 1 +
.../dependency/analyze/TestAnalyzeDepMgt.java | 9 +++++++
3 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1ea2e19c..d4b9dc09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,10 +87,10 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.2.5</mavenVersion>
+ <mavenVersion>3.6.3</mavenVersion>
<jettyVersion>9.4.54.v20240208</jettyVersion>
<pluginTestingVersion>3.3.0</pluginTestingVersion>
- <resolverVersion>1.0.2.v20150114</resolverVersion>
+ <resolverVersion>1.4.1</resolverVersion>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2023-10-20T21:21:50Z</project.build.outputTimestamp>
<slf4j.version>1.7.36</slf4j.version>
@@ -148,7 +148,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>
@@ -244,6 +244,10 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -282,16 +286,15 @@ under the License.
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-util</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
<version>${resolverVersion}</version>
- <scope>provided</scope>
</dependency>
<!-- IDE build support (https://github.com/codehaus-plexus/plexus-build-api) -->
<dependency>
@@ -304,20 +307,20 @@ under the License.
<!-- test -->
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-basic</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-transport-file</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-file</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-transport-http</artifactId>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-http</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
diff --git a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTest.java b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTest.java
index eba04753..5c450f3d 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTest.java
@@ -81,6 +81,7 @@ public class AbstractDependencyMojoTest extends TestCase {
artifactRepos.add(newRepositoryWithId("ar-snapshots"));
artifactRepos.add(newRepositoryWithId("ar-staging"));
+ when(buildingRequest.getRepositoryMerging()).thenReturn(ProjectBuildingRequest.RepositoryMerging.POM_DOMINANT);
when(session.getProjectBuildingRequest()).thenReturn(buildingRequest);
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
index 7b78a6ea..44e32cbb 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
@@ -111,32 +111,41 @@ public class TestAnalyzeDepMgt extends TestCase {
// sure it's ok before
// testing the next one
dep.setType("t");
+ dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setType("type");
+ dep.clearManagementKey();
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setArtifactId("a");
+ dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setArtifactId("artifact");
+ dep.clearManagementKey();
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setClassifier("c");
+ dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setClassifier("class");
+ dep.clearManagementKey();
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setGroupId("g");
+ dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setGroupId("group");
dep.setClassifier(null);
+ dep.clearManagementKey();
artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", null);
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
dep.setClassifier("");
+ dep.clearManagementKey();
artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", "");
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
}