From f40ef149bade620795b0b7a622e90b0548444c24 Mon Sep 17 00:00:00 2001 From: goutamadwant Date: Wed, 5 Aug 2026 21:59:42 -0700 Subject: [PATCH] [MNG-8709] Fix consumer POM profile property validation Use properties from profiles already active in the built project when validating the consumer model. Preserve user-property precedence and keep the generated consumer POM profile-backed. Add a Core IT for dependency versions supplied by an active-by-default profile. --- .../impl/DefaultConsumerPomBuilder.java | 11 +++- ...ITmng8709ProfileDependencyVersionTest.java | 51 +++++++++++++++++++ .../apache/maven/it/TestSuiteOrdering.java | 1 + .../pom.xml | 49 ++++++++++++++++++ 4 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8709ProfileDependencyVersionTest.java create mode 100644 its/core-it-suite/src/test/resources/mng-8709-profile-dependency-version/pom.xml 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 c9c13f89e22a..2d0217f0e42b 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 @@ -265,7 +265,16 @@ private ModelBuilderResult buildModel(RepositorySystemSession session, MavenProj request.source(src); request.locationTracking(false); request.systemProperties(iSession.getSystemProperties()); - request.userProperties(iSession.getUserProperties()); + Map userProperties = new LinkedHashMap<>(); + // BUILD_CONSUMER does not reactivate project profiles, so expose properties from profiles + // that were already active when the project model was built. + if (project != null && project.getActiveProfiles() != null) { + for (org.apache.maven.model.Profile profile : project.getActiveProfiles()) { + userProperties.putAll(profile.getDelegate().getProperties()); + } + } + userProperties.putAll(iSession.getUserProperties()); + request.userProperties(userProperties); request.lifecycleBindingsInjector(lifecycleBindingsInjector::injectLifecycleBindings); // Pass remote repositories so that the model builder can resolve BOM imports // from non-central repositories (e.g., repositories defined in settings.xml profiles). diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8709ProfileDependencyVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8709ProfileDependencyVersionTest.java new file mode 100644 index 000000000000..57dcf4d37729 --- /dev/null +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng8709ProfileDependencyVersionTest.java @@ -0,0 +1,51 @@ +/* + * 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.Files; +import java.nio.file.Path; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +class MavenITmng8709ProfileDependencyVersionTest extends AbstractMavenIntegrationTestCase { + + MavenITmng8709ProfileDependencyVersionTest() { + super("[4.0.0-rc-6,)"); + } + + @Test + void dependencyVersionFromActiveProfileIsValidForConsumerPom() throws Exception { + Path basedir = extractResources("/mng-8709-profile-dependency-version") + .getAbsoluteFile() + .toPath(); + + Verifier verifier = newVerifier(basedir.toString()); + verifier.addCliArgument("install"); + verifier.execute(); + verifier.verifyErrorFreeLog(); + + Path consumerPom = Path.of(verifier.getArtifactPath( + "org.apache.maven.its.mng8709", "profile-version", "1.0", "pom")); + String content = Files.readString(consumerPom); + assertTrue(content.contains("true")); + assertTrue(content.contains("${junit.version}")); + } +} diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java index 7d862fc0b75a..32e3fcfd846c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/TestSuiteOrdering.java @@ -116,6 +116,7 @@ public TestSuiteOrdering() { suite.addTestSuite(MavenITgh10312TerminallyDeprecatedMethodInGuiceTest.class); suite.addTestSuite(MavenITgh10937QuotedPipesInMavenOptsTest.class); suite.addTestSuite(MavenITgh2532DuplicateDependencyEffectiveModelTest.class); + suite.addTestSuite(MavenITmng8709ProfileDependencyVersionTest.class); suite.addTestSuite(MavenITmng8736ConcurrentFileActivationTest.class); suite.addTestSuite(MavenITmng8744CIFriendlyTest.class); suite.addTestSuite(MavenITmng8572DITypeHandlerTest.class); diff --git a/its/core-it-suite/src/test/resources/mng-8709-profile-dependency-version/pom.xml b/its/core-it-suite/src/test/resources/mng-8709-profile-dependency-version/pom.xml new file mode 100644 index 000000000000..911a7986c3c4 --- /dev/null +++ b/its/core-it-suite/src/test/resources/mng-8709-profile-dependency-version/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.apache.maven.its.mng8709 + profile-version + 1.0 + + + + default-versions + + true + + + 5.11.0 + + + + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + +