Fixes

apache · Sep 12, 2024 · 8d7ae43 · 8d7ae43
1 parent f3f64f4
commit 8d7ae43
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 33 deletions.
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
@@ -111,15 +111,9 @@ public void testPublishedPoms() throws Exception {
     }
 
     static void assertTextEquals(File file1, File file2) throws IOException {
-        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);
-        }
+        assertEquals(
+                "pom files differ " + file1 + " " + file2,
+                String.join("\n",FileUtils.loadFile(file1)),
+                String.join("\n",FileUtils.loadFile(file2)));
     }
 }
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
@@ -134,6 +134,9 @@ public void testPublishedPoms() throws Exception {
     }
 
     static void assertTextEquals(File file1, File file2) throws IOException {
-        assertEquals(FileUtils.loadFile(file1), FileUtils.loadFile(file2));
+        assertEquals(
+                "pom files differ " + file1 + " " + file2,
+                String.join("\n",FileUtils.loadFile(file1)),
+                String.join("\n",FileUtils.loadFile(file2)));
     }
 }
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
@@ -18,10 +18,7 @@ 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>
+  <parent />
   <artifactId>simple-weather</artifactId>
   <packaging>jar</packaging>
 

diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom b/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp-build.pom
@@ -18,10 +18,7 @@ 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>
+  <parent />
 
   <artifactId>simple-webapp</artifactId>
   <name>Multi Chapter Simple Web Application Project</name>

diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils-build.pom
@@ -19,8 +19,6 @@ 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/xsd/maven-4.1.0.xsd">
   <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>utils-parent</artifactId>
     <relativePath>../utils-parent</relativePath>
   </parent>
   <artifactId>simple-testutils</artifactId>

diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather-build.pom
@@ -18,10 +18,7 @@ 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/xsd/maven-4.1.0.xsd">
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
+  <parent />
   <artifactId>simple-weather</artifactId>
   <packaging>jar</packaging>
 

diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp-build.pom
@@ -18,10 +18,7 @@ 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/xsd/maven-4.1.0.xsd">
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
+  <parent />
 
   <artifactId>simple-webapp</artifactId>
   <name>Multi Chapter Simple Web Application Project</name>

diff --git a/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom b/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/utils-parent-build.pom
@@ -18,10 +18,7 @@ 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/xsd/maven-4.1.0.xsd">
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
+  <parent />
   <artifactId>utils-parent</artifactId>
   <packaging>pom</packaging>
 </project>