This is an automated email from the ASF dual-hosted git repository.
gnodet 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 89429a310e Fix BUILD_CONSUMER profile activation for locally-resolved
parent POMs (#12286)
89429a310e is described below
commit 89429a310e08918e3a61e826160976401109c9f6
Author: Guillaume Nodet <[email protected]>
AuthorDate: Wed Jun 17 09:54:35 2026 +0200
Fix BUILD_CONSUMER profile activation for locally-resolved parent POMs
(#12286)
Backport of #11799 to maven-4.0.x.
Ensure readParentLocally() uses CONSUMER_PARENT when the current request is
BUILD_CONSUMER, consistent with resolveAndReadParentExternally().
Fixes #11798
---
.../maven/impl/model/DefaultModelBuilder.java | 9 +++-
.../maven/impl/model/DefaultModelBuilderTest.java | 47 +++++++++++++++++
.../factory/consumer-profile-property-child.xml | 27 ++++++++++
.../factory/consumer-profile-property-parent.xml | 52 +++++++++++++++++++
...nITgh11798ConsumerPomProfileActivationTest.java | 48 ++++++++++++++++++
.../child/pom.xml | 43 ++++++++++++++++
.../pom.xml | 59 ++++++++++++++++++++++
.../its/gh11798/test-bom/1.0/test-bom-1.0.pom | 7 +++
8 files changed, 290 insertions(+), 2 deletions(-)
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 8ff55f1ef0..481730dd5c 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
@@ -1140,7 +1140,13 @@ private Model readParentLocally(
}
try {
- ModelBuilderSessionState derived = derive(candidateSource);
+ ModelBuilderSessionState derived = derive(
+ request.getRequestType() ==
ModelBuilderRequest.RequestType.BUILD_CONSUMER
+ ? ModelBuilderRequest.builder(request)
+
.requestType(ModelBuilderRequest.RequestType.CONSUMER_PARENT)
+ .source(candidateSource)
+ .build()
+ : ModelBuilderRequest.build(request,
candidateSource));
// Check GA match BEFORE readAsParentModel() which recursively
resolves
// the candidate's parent chain and can trigger false cycle
detection (GH-12074).
@@ -1155,7 +1161,6 @@ private Model readParentLocally(
mismatchRelativePathAndGA(childModel, fileGroupId,
fileArtifactId);
return null;
}
-
Model candidateModel =
derived.readAsParentModel(profileActivationContext, parentChain);
// Add profiles from parent, preserving model ID tracking
for (Map.Entry<String, List<Profile>> entry :
diff --git
a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
index 6502d92561..0789ca89fa 100644
---
a/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
+++
b/impl/maven-impl/src/test/java/org/apache/maven/impl/model/DefaultModelBuilderTest.java
@@ -38,6 +38,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -397,6 +398,52 @@ public void testBuildConsumerWithExplicitRepositories() {
"Derived session externalRepositories should include the
custom repo from the request");
}
+ /**
+ * Verifies that BUILD_CONSUMER resolves properties defined in parent POM
profiles
+ * when the parent is found via reactor model resolution (mappedSources).
+ */
+ @Test
+ public void testBuildConsumerResolvesParentProfileProperties() {
+ Path parentPom = getPom("consumer-profile-property-parent");
+ Path childPom = getPom("consumer-profile-property-child");
+
+ ModelBuilder.ModelBuilderSession mbs = builder.newSession();
+
+ mbs.build(ModelBuilderRequest.builder()
+ .session(session)
+ .requestType(ModelBuilderRequest.RequestType.BUILD_PROJECT)
+ .source(Sources.buildSource(parentPom))
+ .build());
+
+ ModelBuilderResult consumerResult = assertDoesNotThrow(
+ () -> mbs.build(ModelBuilderRequest.builder()
+ .session(session)
+
.requestType(ModelBuilderRequest.RequestType.BUILD_CONSUMER)
+ .source(Sources.buildSource(childPom))
+ .build()),
+ "BUILD_CONSUMER should not fail when parent defines properties
in profiles");
+
+ assertNotNull(consumerResult);
+ Model effectiveModel = consumerResult.getEffectiveModel();
+ assertNotNull(effectiveModel);
+
+ assertEquals(
+ "1.2.3",
+ effectiveModel.getProperties().get("managed.version"),
+ "Property from parent's profile should be resolved in
BUILD_CONSUMER effective model");
+
+ assertNotNull(effectiveModel.getDependencyManagement());
+ Dependency managedDep =
effectiveModel.getDependencyManagement().getDependencies().stream()
+ .filter(d -> "managed-lib".equals(d.getArtifactId()))
+ .findFirst()
+ .orElse(null);
+ assertNotNull(managedDep, "Managed dependency from parent should be
inherited");
+ assertEquals(
+ "1.2.3",
+ managedDep.getVersion(),
+ "Managed dependency version should be interpolated, not
${managed.version}");
+ }
+
private Path getPom(String name) {
return Paths.get("src/test/resources/poms/factory/" + name +
".xml").toAbsolutePath();
}
diff --git
a/impl/maven-impl/src/test/resources/poms/factory/consumer-profile-property-child.xml
b/impl/maven-impl/src/test/resources/poms/factory/consumer-profile-property-child.xml
new file mode 100644
index 0000000000..a85499d5fe
--- /dev/null
+++
b/impl/maven-impl/src/test/resources/poms/factory/consumer-profile-property-child.xml
@@ -0,0 +1,27 @@
+<?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.1.0";>
+ <parent>
+ <groupId>org.apache.maven.tests</groupId>
+ <artifactId>consumer-profile-property-parent</artifactId>
+ <relativePath>consumer-profile-property-parent.xml</relativePath>
+ </parent>
+ <artifactId>consumer-profile-property-child</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+</project>
diff --git
a/impl/maven-impl/src/test/resources/poms/factory/consumer-profile-property-parent.xml
b/impl/maven-impl/src/test/resources/poms/factory/consumer-profile-property-parent.xml
new file mode 100644
index 0000000000..b7919ef254
--- /dev/null
+++
b/impl/maven-impl/src/test/resources/poms/factory/consumer-profile-property-parent.xml
@@ -0,0 +1,52 @@
+<?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.1.0";>
+ <groupId>org.apache.maven.tests</groupId>
+ <artifactId>consumer-profile-property-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <!--
+ The property "managed.version" is ONLY defined inside a profile
+ with property-based activation. This simulates the real-world
+ scenario where parent POMs define version properties in profiles.
+ -->
+ <profiles>
+ <profile>
+ <id>default-versions</id>
+ <activation>
+ <property>
+ <name>!skipDefaultVersions</name>
+ </property>
+ </activation>
+ <properties>
+ <managed.version>1.2.3</managed.version>
+ </properties>
+ </profile>
+ </profiles>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.example</groupId>
+ <artifactId>managed-lib</artifactId>
+ <version>${managed.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11798ConsumerPomProfileActivationTest.java
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11798ConsumerPomProfileActivationTest.java
new file mode 100644
index 0000000000..b185bcf05f
--- /dev/null
+++
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITgh11798ConsumerPomProfileActivationTest.java
@@ -0,0 +1,48 @@
+/*
+ * 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.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Verify that consumer POM generation preserves profile activation for
locally-resolved parent POMs.
+ * When a parent POM defines properties inside a profile with property-based
activation,
+ * those properties must be resolved during BUILD_CONSUMER so that BOM imports
using
+ * those properties do not fail with "Invalid Version Range Request".
+ *
+ * @see <a href="https://github.com/apache/maven/issues/11798";>GH-11798</a>
+ */
+class MavenITgh11798ConsumerPomProfileActivationTest extends
AbstractMavenIntegrationTestCase {
+
+ MavenITgh11798ConsumerPomProfileActivationTest() {
+ super("[4.0.0-rc-1,)");
+ }
+
+ @Test
+ void testConsumerPomResolvesParentProfileProperties() throws Exception {
+ Path basedir =
extractResources("/gh-11798-consumer-pom-profile-activation").toPath();
+
+ Verifier verifier = newVerifier(basedir.toString());
+ verifier.addCliArgument("install");
+ verifier.execute();
+ verifier.verifyErrorFreeLog();
+ }
+}
diff --git
a/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/child/pom.xml
b/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/child/pom.xml
new file mode 100644
index 0000000000..21c12802b7
--- /dev/null
+++
b/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/child/pom.xml
@@ -0,0 +1,43 @@
+<?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.1.0";>
+ <modelVersion>4.1.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven.its.gh11798</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <artifactId>child</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.gh11798</groupId>
+ <artifactId>test-bom</artifactId>
+ <version>${dep.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git
a/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/pom.xml
b/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/pom.xml
new file mode 100644
index 0000000000..f37a5a75cb
--- /dev/null
+++
b/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/pom.xml
@@ -0,0 +1,59 @@
+<?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.1.0"; root="true">
+ <modelVersion>4.1.0</modelVersion>
+
+ <groupId>org.apache.maven.its.gh11798</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>child</module>
+ </modules>
+
+ <repositories>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <id>local-test-repo</id>
+ <url>file://${project.rootDirectory}/repo</url>
+ </repository>
+ </repositories>
+
+ <profiles>
+ <profile>
+ <id>default-versions</id>
+ <activation>
+ <property>
+ <name>!skipDefaultVersions</name>
+ </property>
+ </activation>
+ <properties>
+ <dep.version>1.0</dep.version>
+ </properties>
+ </profile>
+ </profiles>
+</project>
diff --git
a/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/repo/org/apache/maven/its/gh11798/test-bom/1.0/test-bom-1.0.pom
b/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/repo/org/apache/maven/its/gh11798/test-bom/1.0/test-bom-1.0.pom
new file mode 100644
index 0000000000..7e82f9cdf8
--- /dev/null
+++
b/its/core-it-suite/src/test/resources/gh-11798-consumer-pom-profile-activation/repo/org/apache/maven/its/gh11798/test-bom/1.0/test-bom-1.0.pom
@@ -0,0 +1,7 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.gh11798</groupId>
+ <artifactId>test-bom</artifactId>
+ <version>1.0</version>
+ <packaging>pom</packaging>
+</project>
