This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new d7cada9c0b [MNG-8645] Fix dependency management section of consumer
POM (#2183)
d7cada9c0b is described below
commit d7cada9c0b49c5f7ac7aced52498e354877333b1
Author: Guillaume Nodet <[email protected]>
AuthorDate: Tue Mar 25 16:28:18 2025 +0100
[MNG-8645] Fix dependency management section of consumer POM (#2183)
---
.../impl/DefaultConsumerPomBuilder.java | 4 +-
.../maven/impl/resolver/type/DefaultType.java | 12 ++++
...mng8645ConsumerPomDependencyManagementTest.java | 74 ++++++++++++++++++++++
.../mng-8645-consumer-pom-dep-mgmt/pom.xml | 25 ++++++++
4 files changed, 113 insertions(+), 2 deletions(-)
diff --git
a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
index e3164beba4..9d74419c98 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/internal/transformation/impl/DefaultConsumerPomBuilder.java
@@ -176,8 +176,8 @@ private Dependency merge(Dependency dep1, Dependency dep2) {
}
private static String getDependencyKey(org.apache.maven.api.Dependency
dependency) {
- return dependency.getGroupId() + ":" + dependency.getArtifactId() +
":" + dependency.getType() + ":"
- + dependency.getClassifier();
+ return dependency.getGroupId() + ":" + dependency.getArtifactId() + ":"
+ + dependency.getType().id() + ":" + dependency.getClassifier();
}
private static String getDependencyKey(Dependency dependency) {
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultType.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultType.java
index 5922fea225..86607b7703 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultType.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/resolver/type/DefaultType.java
@@ -111,4 +111,16 @@ public Set<PathType> getPathTypes() {
public Map<String, String> getProperties() {
return properties;
}
+
+ @Override
+ public String toString() {
+ return "DefaultType[" + "id='"
+ + id + '\'' + ", language="
+ + language + ", extension='"
+ + extension + '\'' + ", classifier='"
+ + classifier + '\'' + ", includesDependencies="
+ + includesDependencies + ", pathTypes="
+ + pathTypes + ", properties="
+ + properties + ']';
+ }
}
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8645ConsumerPomDependencyManagementTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8645ConsumerPomDependencyManagementTest.java
new file mode 100644
index 0000000000..a6e32c0d15
--- /dev/null
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8645ConsumerPomDependencyManagementTest.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.it;
+
+import java.io.Reader;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.maven.api.model.Model;
+import org.apache.maven.model.v4.MavenStaxReader;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * This is a test set for <a
href="https://issues.apache.org/jira/browse/MNG-8645";>MNG-8645</a>.
+ */
+class MavenITmng8645ConsumerPomDependencyManagementTest extends
AbstractMavenIntegrationTestCase {
+
+ MavenITmng8645ConsumerPomDependencyManagementTest() {
+ super("(4.0.0-rc-3,)");
+ }
+
+ /**
+ * Verify the dependency management of the consumer POM is computed
correctly
+ */
+ @Test
+ void testIt() throws Exception {
+ Path basedir = extractResources("/mng-8645-consumer-pom-dep-mgmt")
+ .getAbsoluteFile()
+ .toPath();
+
+ Verifier verifier = newVerifier(basedir.toString());
+ verifier.addCliArgument("install");
+ verifier.execute();
+ verifier.verifyErrorFreeLog();
+
+ // validate consumer pom
+ Path consumerPom = basedir.resolve(Paths.get(
+ "target",
+ "project-local-repo",
+ "org.apache.maven.its.mng8645",
+ "test",
+ "1.0",
+ "test-1.0-consumer.pom"));
+ assertTrue(Files.exists(consumerPom));
+ Model consumerPomModel;
+ try (Reader r = Files.newBufferedReader(consumerPom)) {
+ consumerPomModel = new MavenStaxReader().read(r);
+ }
+ assertNotNull(consumerPomModel.getDependencyManagement());
+ assertEquals(
+ 1,
consumerPomModel.getDependencyManagement().getDependencies().size());
+ }
+}
diff --git
a/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml
b/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml
new file mode 100644
index 0000000000..6665c0f712
--- /dev/null
+++
b/its/core-it-suite/src/test/resources/mng-8645-consumer-pom-dep-mgmt/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; root="true"
xsi:schemaLocation="http://maven.apache.org/POM/4.1.0
https://maven.apache.org/xsd/maven-4.1.0.xsd";>
+ <groupId>org.apache.maven.its.mng8645</groupId>
+ <artifactId>test</artifactId>
+ <version>1.0</version>
+ <packaging>jar</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.16.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>file-management</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ </dependencies>
+</project>
