[MNG-7877] Fix ITs for build bom + consumer/pom simplification (#292)

apache · Sep 13, 2023 · 37b9369 · 37b9369
1 parent 2730c77
commit 37b9369
Show file tree

Hide file tree

Showing 30 changed files with 466 additions and 233 deletions.
diff --git a/...suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/...suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -48,6 +48,7 @@ public void testitMNG1021() throws Exception {
         verifier.setAutoclean(false);
         verifier.deleteDirectory("repo");
         verifier.deleteArtifacts("org.apache.maven.its.mng1021");
+        verifier.addCliArgument("-Dmaven.experimental.buildconsumer=false");
         verifier.addCliArgument("initialize");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/...a/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/...a/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
@@ -46,6 +46,7 @@ public void testitMNG3396() throws Exception {
         verifier.deleteArtifact(GROUP_ID, "A", "1.0", "jar");
         verifier.deleteArtifact(GROUP_ID, "B", "1.0", "pom");
         verifier.deleteArtifact(GROUP_ID, "B", "1.0", "jar");
+        verifier.addCliArgument("-Dmaven.experimental.buildconsumer=false");
         verifier.addCliArgument("install");
         verifier.execute();
         verifier.verifyErrorFreeLog();
@@ -59,6 +60,7 @@ public void testitMNG3396() throws Exception {
         verifier.deleteArtifact(GROUP_ID, "A", "3.0", "jar");
         verifier.deleteArtifact(GROUP_ID, "plugin", "1.0", "pom");
         verifier.deleteArtifact(GROUP_ID, "plugin", "1.0", "jar");
+        verifier.addCliArgument("-Dmaven.experimental.buildconsumer=false");
         verifier.addCliArgument("install");
         verifier.execute();
         verifier.verifyErrorFreeLog();
@@ -68,6 +70,7 @@ public void testitMNG3396() throws Exception {
         verifier = newVerifier(testDir.getAbsolutePath(), "remote");
         verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "pom");
         verifier.deleteArtifact(GROUP_ID, "pluginuser", "1.0", "jar");
+        verifier.addCliArgument("-Dmaven.experimental.buildconsumer=false");
         verifier.addCliArgument("install");
         verifier.execute();
         verifier.verifyErrorFreeLog();

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
@@ -20,11 +20,13 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 
 import org.apache.maven.shared.utils.io.FileUtils;
 import org.apache.maven.shared.verifier.Verifier;
 import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
 
 /**
  * With the build-consumer the pom.xml will be adjusted during the process.
@@ -77,6 +79,11 @@ public void testPublishedPoms() throws Exception {
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom")));
 
+        assertTextEquals(
+                new File(testDir, "expected/parent-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", "build")));
+
         assertTextEquals(
                 new File(testDir, "expected/simple-parent.pom"),
                 new File(verifier.getArtifactPath(
@@ -87,13 +94,32 @@ public void testPublishedPoms() throws Exception {
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom")));
 
+        assertTextEquals(
+                new File(testDir, "expected/simple-weather-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", "build")));
+
         assertTextEquals(
                 new File(testDir, "expected/simple-webapp.pom"),
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom")));
+
+        assertTextEquals(
+                new File(testDir, "expected/simple-webapp-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", "build")));
     }
 
     static void assertTextEquals(File file1, File file2) throws IOException {
-        assertEquals(FileUtils.loadFile(file1), FileUtils.loadFile(file2));
+        List<String> s1 = FileUtils.loadFile(file1);
+        List<String> s2 = FileUtils.loadFile(file2);
+        try {
+            assertEquals("Not same size", s1.size(), s2.size());
+            for (int i = 0; i < s1.size(); i++) {
+                assertEquals("Mismatch line " + i, s1.get(i), s2.get(i));
+            }
+        } catch (AssertionFailedError error) {
+            assertEquals(error.getMessage(), s1, s2);
+        }
     }
 }
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
@@ -77,30 +77,60 @@ public void testPublishedPoms() throws Exception {
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom")));
 
+        assertTextEquals(
+                new File(testDir, "expected/parent-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom", "build")));
+
         assertTextEquals(
                 new File(testDir, "expected/simple-parent.pom"),
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom")));
 
+        assertTextEquals(
+                new File(testDir, "expected/simple-parent-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom", "build")));
+
         assertTextEquals(
                 new File(testDir, "expected/simple-weather.pom"),
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom")));
 
+        assertTextEquals(
+                new File(testDir, "expected/simple-weather-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom", "build")));
+
         assertTextEquals(
                 new File(testDir, "expected/simple-webapp.pom"),
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom")));
 
+        assertTextEquals(
+                new File(testDir, "expected/simple-webapp-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom", "build")));
+
         assertTextEquals(
                 new File(testDir, "expected/simple-testutils.pom"),
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom")));
 
+        assertTextEquals(
+                new File(testDir, "expected/simple-testutils-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom", "build")));
+
         assertTextEquals(
                 new File(testDir, "expected/utils-parent.pom"),
                 new File(verifier.getArtifactPath(
                         "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom")));
+
+        assertTextEquals(
+                new File(testDir, "expected/utils-parent-build.pom"),
+                new File(verifier.getArtifactPath(
+                        "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom", "build")));
     }
 
     static void assertTextEquals(File file1, File file2) throws IOException {

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7228LeakyModelTest.java
@@ -21,6 +21,7 @@
 import java.io.File;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.apache.maven.shared.verifier.Verifier;
 import org.apache.maven.shared.verifier.util.ResourceExtractor;
 import org.junit.jupiter.api.Test;
@@ -54,8 +55,12 @@ void testLeakyModel() throws Exception {
 
         verifier.verifyErrorFreeLog();
 
-        String pom = FileUtils.readFileToString(
-                new File(verifier.getArtifactPath("org.apache.maven.its.mng7228", "test", "1.0.0-SNAPSHOT", "pom")));
+        String classifier = null;
+        if (getMavenVersion().compareTo(new DefaultArtifactVersion("4.0.0-alpha-7")) > 0) {
+            classifier = "build";
+        }
+        String pom = FileUtils.readFileToString(new File(
+                verifier.getArtifactPath("org.apache.maven.its.mng7228", "test", "1.0.0-SNAPSHOT", "pom", classifier)));
 
         assertThat(pom, containsString("projectProperty"));
         assertThat(pom, not(containsString("activeProperty")));

diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent-build.pom
@@ -0,0 +1,31 @@
+<?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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" root="true" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/maven-v4_1_0.xsd">
+    <groupId>org.sonatype.mavenbook.multi</groupId>
+    <artifactId>parent</artifactId>
+    <version>0.9-${changelist}-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Multi Chapter Parent Project</name>
+
+    <!-- Optimized from https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
+    <modules>
+        <module>simple-parent</module>
+    </modules>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/parent.pom
@@ -1,30 +1,9 @@
 <?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/maven-v4_0_0.xsd">
+<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.sonatype.mavenbook.multi</groupId>
   <artifactId>parent</artifactId>
   <version>0.9-MNG6656-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Multi Chapter Parent Project</name>
-
-  <!-- Optimized from https://github.com/sonatype/maven-example-en/tree/master/examples/ch-multi -->
-
-</project>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent-build.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent-build.pom
@@ -0,0 +1,46 @@
+<?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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.sonatype.mavenbook.multi</groupId>
+    <artifactId>parent</artifactId>
+  </parent>
+  <artifactId>simple-parent</artifactId>
+  <packaging>pom</packaging>
+  <name>Multi Chapter Simple Parent Project</name>
+
+  <modules>
+    <module>simple-weather</module>
+    <module>simple-webapp</module>
+  </modules>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-parent.pom
@@ -1,23 +1,5 @@
 <?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/maven-v4_0_0.xsd">
+<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.sonatype.mavenbook.multi</groupId>
@@ -27,18 +9,13 @@ under the License.
   <artifactId>simple-parent</artifactId>
   <packaging>pom</packaging>
   <name>Multi Chapter Simple Parent Project</name>
-
-
-
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
         </plugin>
       </plugins>
     </pluginManagement>
   </build>
-
-</project>
+</project>
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather-build.pom
@@ -0,0 +1,30 @@
+<?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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.1.0 https://maven.apache.org/maven-v4_1_0.xsd">
+  <parent>
+    <groupId>org.sonatype.mavenbook.multi</groupId>
+    <artifactId>simple-parent</artifactId>
+  </parent>
+  <artifactId>simple-weather</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Multi Chapter Simple Weather API</name>
+
+</project>