(maven) branch master updated: [MNG-8679] Align superpom with mvn3 (#2246)

[cstamas]

This is an automated email from the ASF dual-hosted git repository.

cstamas 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 d47dfb68c4 [MNG-8679] Align superpom with mvn3 (#2246)
d47dfb68c4 is described below

commit d47dfb68c458284752a4ad91d67c8faacb2d02fa
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Mon Apr 7 15:30:22 2025 +0200

    [MNG-8679] Align superpom with mvn3 (#2246)
    
    The filtered resources were not added in mvn3, causing slight diffs when a 
model 4.0.0 project is built with mvn3 and mvn4. Superpom for 4.1.0 is 
unchanged.
    
    The `MavenITmng3843PomInheritanceTest.java` needed some changes as well, to 
undo this.
    
    ---
    
    https://issues.apache.org/jira/browse/MNG-8679
---
 .../resources/org/apache/maven/model/pom-4.0.0.xml     |  8 --------
 .../resources/org/apache/maven/model/pom-4.0.0.xml     |  8 --------
 .../maven/it/MavenITmng3843PomInheritanceTest.java     | 18 +++---------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git 
a/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
 
b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index ff7738614f..ca05bd7eea 100644
--- 
a/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ 
b/compat/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -42,19 +42,11 @@ under the License.
       <resource>
         <directory>${project.basedir}/src/main/resources</directory>
       </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/resources-filtered</directory>
-        <filtering>true</filtering>
-      </resource>
     </resources>
     <testResources>
       <testResource>
         <directory>${project.basedir}/src/test/resources</directory>
       </testResource>
-      <testResource>
-        <directory>${project.basedir}/src/test/resources-filtered</directory>
-        <filtering>true</filtering>
-      </testResource>
     </testResources>
   </build>
 
diff --git 
a/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml 
b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index ff7738614f..ca05bd7eea 100644
--- a/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/impl/maven-impl/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -42,19 +42,11 @@ under the License.
       <resource>
         <directory>${project.basedir}/src/main/resources</directory>
       </resource>
-      <resource>
-        <directory>${project.basedir}/src/main/resources-filtered</directory>
-        <filtering>true</filtering>
-      </resource>
     </resources>
     <testResources>
       <testResource>
         <directory>${project.basedir}/src/test/resources</directory>
       </testResource>
-      <testResource>
-        <directory>${project.basedir}/src/test/resources-filtered</directory>
-        <filtering>true</filtering>
-      </testResource>
     </testResources>
   </build>
 
diff --git 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
index b21dd3c9e1..da8b71a859 100644
--- 
a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
+++ 
b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
@@ -109,23 +109,11 @@ public void testitMNG3843() throws Exception {
         assertPathEquals(basedir, "src/main/java", 
props.getProperty("project.build.sourceDirectory"));
         assertPathEquals(basedir, "src/test/java", 
props.getProperty("project.build.testSourceDirectory"));
         assertPathEquals(basedir, "src/main/scripts", 
props.getProperty("project.build.scriptSourceDirectory"));
-        if (matchesVersionRange("[4.0.0-alpha-1,)")) {
-            assertEquals("2", props.getProperty("project.build.resources"));
-            assertEquals("2", 
props.getProperty("project.build.testResources"));
-        } else {
-            assertEquals("1", props.getProperty("project.build.resources"));
-            assertEquals("1", 
props.getProperty("project.build.testResources"));
-        }
+        // model is 4.0.0: SuperPOM does not auto-add filtered-resources
+        assertEquals("1", props.getProperty("project.build.resources"));
+        assertEquals("1", props.getProperty("project.build.testResources"));
         assertPathEquals(basedir, "src/main/resources", 
props.getProperty("project.build.resources.0.directory"));
         assertPathEquals(basedir, "src/test/resources", 
props.getProperty("project.build.testResources.0.directory"));
-        if (matchesVersionRange("[4.0.0-alpha-1,)")) {
-            assertPathEquals(
-                    basedir, "src/main/resources-filtered", 
props.getProperty("project.build.resources.1.directory"));
-            assertPathEquals(
-                    basedir,
-                    "src/test/resources-filtered",
-                    
props.getProperty("project.build.testResources.1.directory"));
-        }
         assertPathEquals(basedir, "target", 
props.getProperty("project.build.directory"));
         assertPathEquals(basedir, "target/classes", 
props.getProperty("project.build.outputDirectory"));
         assertPathEquals(basedir, "target/test-classes", 
props.getProperty("project.build.testOutputDirectory"));