This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.10.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.10.x by this push:
new 171a3f4e74 Fix #13985: Do not reuse imported dependency management
cached without locations (#13988)
171a3f4e74 is described below
commit 171a3f4e74f027672e3aae28e30f0f62333e9d31
Author: dodoshell <[email protected]>
AuthorDate: Tue Nov 17 18:45:00 2026 +0100
Fix #13985: Do not reuse imported dependency management cached without
locations (#13988)
The dependency management of an imported BOM was cached under its
groupId:artifactId:version and the "import" tag, whatever the location
tracking of the build that imported it. When the BOM was first imported
by a model built without location tracking, e.g. while reading the POM
of a build extension, a later project build with location tracking
reused that copy, and the managed dependencies it contributed had no
InputLocation.
Cache the dependency management of builds with location tracking under
a separate tag, so they never pick up a copy without locations.
---
.../maven/model/building/DefaultModelBuilder.java | 7 +-
.../apache/maven/model/building/ModelCacheTag.java | 27 +++++++
.../model/building/DefaultModelBuilderTest.java | 84 ++++++++++++++++++++++
3 files changed, 116 insertions(+), 2 deletions(-)
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index e2b542f73f..7e8da834d0 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -1226,6 +1226,9 @@ private void importDependencyManagement(
ModelBuildingRequest importRequest = null;
+ ModelCacheTag<DependencyManagement> importTag =
+ request.isLocationTracking() ?
ModelCacheTag.IMPORT_WITH_LOCATIONS : ModelCacheTag.IMPORT;
+
List<DependencyManagement> importMgmts = null;
for (Iterator<Dependency> it = depMgmt.getDependencies().iterator();
it.hasNext(); ) {
@@ -1277,7 +1280,7 @@ private void importDependencyManagement(
}
DependencyManagement importMgmt =
- getCache(request.getModelCache(), groupId, artifactId,
version, ModelCacheTag.IMPORT);
+ getCache(request.getModelCache(), groupId, artifactId,
version, importTag);
if (importMgmt == null) {
if (workspaceResolver == null && modelResolver == null) {
@@ -1351,7 +1354,7 @@ private void importDependencyManagement(
importMgmt = new DependencyManagement();
}
- putCache(request.getModelCache(), groupId, artifactId,
version, ModelCacheTag.IMPORT, importMgmt);
+ putCache(request.getModelCache(), groupId, artifactId,
version, importTag, importMgmt);
}
if (importMgmts == null) {
diff --git
a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
index a37911b44d..9ad2994718 100644
---
a/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
+++
b/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelCacheTag.java
@@ -114,4 +114,31 @@ public DependencyManagement fromCache(DependencyManagement
data) {
return intoCache(data);
}
};
+
+ /**
+ * The tag used to denote an effective dependency management section from
an imported model that was built with
+ * location tracking enabled.
+ */
+ ModelCacheTag<DependencyManagement> IMPORT_WITH_LOCATIONS = new
ModelCacheTag<DependencyManagement>() {
+
+ @Override
+ public String getName() {
+ return "import-with-locations";
+ }
+
+ @Override
+ public Class<DependencyManagement> getType() {
+ return DependencyManagement.class;
+ }
+
+ @Override
+ public DependencyManagement intoCache(DependencyManagement data) {
+ return (data != null) ? data.clone() : null;
+ }
+
+ @Override
+ public DependencyManagement fromCache(DependencyManagement data) {
+ return intoCache(data);
+ }
+ };
}
diff --git
a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
index 02d4f49ed6..d7363178e0 100644
---
a/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
+++
b/maven-model-builder/src/test/java/org/apache/maven/model/building/DefaultModelBuilderTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.model.building;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Repository;
@@ -147,6 +150,87 @@ public void testNotWellFormedPomFailsBuild() {
() -> "Expected a \"Non-parseable POM\" problem, got: " +
e.getProblems());
}
+ /**
+ * #13985: an import cached by a build without location tracking must not
be reused by a build with it.
+ */
+ @Test
+ public void testImportedDependencyManagementKeepsLocations() throws
Exception {
+ String bom = "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <groupId>thegroup</groupId>\n"
+ + " <artifactId>bom</artifactId>\n"
+ + " <version>1</version>\n"
+ + " <packaging>pom</packaging>\n"
+ + " <dependencyManagement>\n"
+ + " <dependencies>\n"
+ + " <dependency>\n"
+ + " <groupId>thegroup</groupId>\n"
+ + " <artifactId>managed</artifactId>\n"
+ + " <version>1</version>\n"
+ + " </dependency>\n"
+ + " </dependencies>\n"
+ + " </dependencyManagement>\n"
+ + "</project>\n";
+ String pom = "<project>\n" + " <modelVersion>4.0.0</modelVersion>\n"
+ + " <groupId>thegroup</groupId>\n"
+ + " <artifactId>consumer</artifactId>\n"
+ + " <version>1</version>\n"
+ + " <dependencyManagement>\n"
+ + " <dependencies>\n"
+ + " <dependency>\n"
+ + " <groupId>thegroup</groupId>\n"
+ + " <artifactId>bom</artifactId>\n"
+ + " <version>1</version>\n"
+ + " <type>pom</type>\n"
+ + " <scope>import</scope>\n"
+ + " </dependency>\n"
+ + " </dependencies>\n"
+ + " </dependencyManagement>\n"
+ + "</project>\n";
+
+ ModelBuilder builder = new DefaultModelBuilderFactory().newInstance();
+ ModelCache cache = new MapModelCache();
+ ModelResolver resolver = new BaseModelResolver() {
+ @Override
+ public ModelSource resolveModel(String groupId, String artifactId,
String version) {
+ return new StringModelSource(bom);
+ }
+ };
+
+ DefaultModelBuildingRequest request = new
DefaultModelBuildingRequest();
+ request.setModelSource(new StringModelSource(pom));
+ request.setModelResolver(resolver);
+ request.setModelCache(cache);
+ request.setLocationTracking(false);
+ builder.build(request);
+
+ request = new DefaultModelBuildingRequest();
+ request.setModelSource(new StringModelSource(pom));
+ request.setModelResolver(resolver);
+ request.setModelCache(cache);
+ request.setLocationTracking(true);
+ ModelBuildingResult result = builder.build(request);
+
+ Dependency managed = result.getEffectiveModel()
+ .getDependencyManagement()
+ .getDependencies()
+ .get(0);
+ assertNotNull(managed.getLocation("version"));
+ }
+
+ static class MapModelCache implements ModelCache {
+ private final Map<String, Object> map = new HashMap<>();
+
+ @Override
+ public void put(String groupId, String artifactId, String version,
String tag, Object data) {
+ map.put(groupId + ':' + artifactId + ':' + version + ':' + tag,
data);
+ }
+
+ @Override
+ public Object get(String groupId, String artifactId, String version,
String tag) {
+ return map.get(groupId + ':' + artifactId + ':' + version + ':' +
tag);
+ }
+ }
+
static class CycleInImportsResolver extends BaseModelResolver {
@Override
public ModelSource resolveModel(Dependency dependency) throws
UnresolvableModelException {