(maven) branch master updated: Fix stale Javadoc and GAV typo in external-profile tests (follow-up to #13141) (#13156)

[gn...@apache.org]

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 fb1aba83bf Fix stale Javadoc and GAV typo in external-profile tests (follow-up to #13141) (#13156)
fb1aba83bf is described below

commit fb1aba83bf711bf507177117006348d4a6f2f447
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Sep 17 18:21:55 2026 +0200

    Fix stale Javadoc and GAV typo in external-profile tests (follow-up to #13141) (#13156)
    
    * Fix stale Javadoc and GAV typo in external-profile tests
    
    - DefaultModelBuilderTest: update resolvedProfilesRequest() Javadoc
      (stale 'contribute no repositories'); fix active-by-default-profile
      resolvedSource GAV (org.apache.maven.test, matching fixture and
      existing test convention)
    - active-by-default-profile.xml: fix groupId plural→singular to match
      the rest of the poms/factory fixtures and the test coordinate hint
    
    Found during review of #13155.
    
    * Revert wrong direction: keep org.apache.maven.test (no 's') in resolvedSource
---
 .../java/org/apache/maven/impl/model/DefaultModelBuilderTest.java | 8 +++++---
 .../src/test/resources/poms/factory/active-by-default-profile.xml | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

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 97ed7bcc3b..377e78cbd3 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
@@ -133,10 +133,12 @@ public void testPropertiesAndProfiles() {
     /**
      * Models built at {@link ModelBuilderRequest.RequestType#CONSUMER_DEPENDENCY} come from a
      * dependency POM resolved from a repository. Their file, property, and condition activators
-     * are not evaluated, and their profiles contribute no repositories. A project build, at
+     * are not evaluated. Platform-derived activation (JDK version, operating system,
+     * activeByDefault) is unaffected at either level. Repositories from legitimately-active
+     * profiles (JDK/OS/activeByDefault) are honored — stripping them would break the established
+     * {@code project → dep1 → dep2} pattern where dep1 declares dep2's non-Central repository
+     * inside a JDK- or activeByDefault-activated profile. A project build, at
      * {@link ModelBuilderRequest.RequestType#BUILD_PROJECT}, still evaluates every activator.
-     * Platform-derived activation (JDK version, operating system, activeByDefault) is unaffected
-     * at either level.
      */
     private ModelBuilderRequest.ModelBuilderRequestBuilder resolvedProfilesRequest(
             ModelBuilderRequest.RequestType requestType) {
diff --git a/impl/maven-impl/src/test/resources/poms/factory/active-by-default-profile.xml b/impl/maven-impl/src/test/resources/poms/factory/active-by-default-profile.xml
index 87c6c0653d..dbac4a5099 100644
--- a/impl/maven-impl/src/test/resources/poms/factory/active-by-default-profile.xml
+++ b/impl/maven-impl/src/test/resources/poms/factory/active-by-default-profile.xml
@@ -16,7 +16,7 @@
  limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.1.0">
-    <groupId>org.apache.maven.tests</groupId>
+    <groupId>org.apache.maven.test</groupId>
     <artifactId>active-by-default-profile</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>