This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-4.0.x by this push:
new 917009683c Bugfix: use GAV and not GAPV in source labels for profiles
(#12406) (#12424)
917009683c is described below
commit 917009683ce2279c0939c388d47428416edaebbc
Author: Tamas Cservenak <[email protected]>
AuthorDate: Sun Jul 5 15:41:35 2026 +0200
Bugfix: use GAV and not GAPV in source labels for profiles (#12406) (#12424)
This introduces no behaviour change between Maven 3 and 4, merely the
labels for "source" of profiles got different.
Fixes #12405
Backport of 923106abde67d83279bfb4cdf24f45fa92960113
---
.../maven/project/DefaultProjectBuilder.java | 12 ++++-
.../project/DefaultMavenProjectBuilderTest.java | 55 ++++++++++++++++++++++
.../multimodule-parent-profiles/child-a/pom.xml | 33 +++++++++++++
.../multimodule-parent-profiles/child-b/pom.xml | 33 +++++++++++++
.../projects/multimodule-parent-profiles/pom.xml | 44 +++++++++++++++++
.../maven/impl/model/DefaultModelBuilder.java | 3 +-
6 files changed, 178 insertions(+), 2 deletions(-)
diff --git
a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
index c3e4a73794..43785dee13 100644
---
a/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
+++
b/impl/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
@@ -799,7 +799,7 @@ implicit fallback (only if they match the default, e.g.,
inherited)
// Fallback to old behavior if map is empty
// This happens when no profiles are active or there's an
issue with profile tracking
project.setInjectedProfileIds(
- result.getEffectiveModel().getId(),
getProfileIds(result.getActivePomProfiles()));
+ getModelDataId(result.getEffectiveModel()),
getProfileIds(result.getActivePomProfiles()));
} else {
for (Map.Entry<String,
List<org.apache.maven.api.model.Profile>> entry : profilesByModel.entrySet()) {
project.setInjectedProfileIds(entry.getKey(),
getProfileIds(entry.getValue()));
@@ -952,6 +952,16 @@ implicit fallback (only if they match the default, e.g.,
inherited)
project.setRemoteArtifactRepositories(remoteRepositories);
}
+ /**
+ * Emulates Maven 3.x {@code ModelData#getId} method, that unlike
model, returned {@code GAV} and not {@code GAPV}.
+ */
+ private static String getModelDataId(Model model) {
+ return ((model.getGroupId() == null) ? "[inherited]" :
model.getGroupId()) + ":"
+ + model.getArtifactId()
+ + ":"
+ + ((model.getVersion() == null) ? "[inherited]" :
model.getVersion());
+ }
+
/**
* Validates that legacy directory configuration does not conflict
with {@code <sources>}.
* <p>
diff --git
a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index d1ebc359a9..d6c4124b6a 100644
---
a/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++
b/impl/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -626,4 +626,59 @@ void testVersionInheritedFromRemoteParentMultiModule()
throws Exception {
assertEquals("1.0", child.getArtifact().getVersion(), "artifact
version should match inherited version");
assertEquals("org.different.group", child.getGroupId(), "groupId
should be from child POM");
}
+
+ /**
+ * Tests that parent profile source keys use consistent GAV format
(groupId:artifactId:version)
+ * across both cache-miss and cache-hit paths in
DefaultModelBuilder.readAsParentModel().
+ *
+ * <p>Before the fix, the cache-miss path used ModelProblemUtils.toId()
(GAV) while the cache-hit
+ * path used Model.getId() (GAPV, which includes packaging). This meant
the same parent's profiles
+ * could appear under different keys depending on build order.
+ */
+ @Test
+ void testParentProfileSourceKeyConsistentAcrossModules() throws Exception {
+ File pom =
getTestFile("src/test/resources/projects/multimodule-parent-profiles/pom.xml");
+ ProjectBuildingRequest configuration = newBuildingRequest();
+ configuration.setLocalRepository(getLocalRepository());
+ InternalSession internalSession =
InternalSession.from(configuration.getRepositorySession());
+ InternalMavenSession mavenSession =
InternalMavenSession.from(internalSession);
+ mavenSession
+ .getMavenSession()
+ .getRequest()
+ .setRootDirectory(pom.toPath().getParent());
+
+ List<ProjectBuildingResult> results =
projectBuilder.build(List.of(pom), true, configuration);
+ assertEquals(3, results.size());
+
+ // The parent GAV key (without packaging) that all children should use
+ String parentGav =
"org.apache.maven.test:multimodule-parent-profiles:1.0-SNAPSHOT";
+
+ for (ProjectBuildingResult result : results) {
+ MavenProject project = result.getProject();
+ if ("pom".equals(project.getPackaging()) &&
"multimodule-parent-profiles".equals(project.getArtifactId())) {
+ continue; // skip the parent itself
+ }
+
+ // Verify that the parent profile source key uses GAV format (no
packaging component)
+ assertTrue(
+ project.getInjectedProfileIds().containsKey(parentGav),
+ "Profile source key for " + project.getArtifactId()
+ + " should use GAV format '" + parentGav
+ + "', but found keys: "
+ + project.getInjectedProfileIds().keySet());
+
+ // Verify the parent-profile was actually tracked
+ assertTrue(
+
project.getInjectedProfileIds().get(parentGav).contains("parent-profile"),
+ "parent-profile should be listed under GAV key for " +
project.getArtifactId());
+
+ // Verify no GAPV key exists (would include ":pom:" packaging)
+ for (String key : project.getInjectedProfileIds().keySet()) {
+ assertFalse(
+ key.contains(":pom:"),
+ "Profile source key for " + project.getArtifactId()
+ + " should not contain packaging, but found: "
+ key);
+ }
+ }
+ }
}
diff --git
a/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/child-a/pom.xml
b/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/child-a/pom.xml
new file mode 100644
index 0000000000..4c3216da47
--- /dev/null
+++
b/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/child-a/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.test</groupId>
+ <artifactId>multimodule-parent-profiles</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>child-a</artifactId>
+</project>
diff --git
a/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/child-b/pom.xml
b/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/child-b/pom.xml
new file mode 100644
index 0000000000..4d9101e706
--- /dev/null
+++
b/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/child-b/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.test</groupId>
+ <artifactId>multimodule-parent-profiles</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>child-b</artifactId>
+</project>
diff --git
a/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/pom.xml
b/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/pom.xml
new file mode 100644
index 0000000000..df79aeb481
--- /dev/null
+++
b/impl/maven-core/src/test/resources/projects/multimodule-parent-profiles/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.test</groupId>
+ <artifactId>multimodule-parent-profiles</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child-a</module>
+ <module>child-b</module>
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>parent-profile</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ </profiles>
+</project>
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
index f8e0017c44..8ae76c2d0a 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelBuilder.java
@@ -1893,7 +1893,8 @@ Model readAsParentModel(DefaultProfileActivationContext
profileActivationContext
replayRecordIntoContext(e.getKey(),
profileActivationContext);
}
// Add the activated profiles from cache to the result
- addActivePomProfiles(cached.model().getId(),
cached.activatedProfiles());
+ // Use ModelProblemUtils.toId() to get
groupId:artifactId:version format (without packaging)
+
addActivePomProfiles(ModelProblemUtils.toId(cached.model()),
cached.activatedProfiles());
return cached.model();
}
}
