From caf44be89eb518e8ec7371840754023db6e3ce9d Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@apache.org>
Date: Tue, 26 Sep 2023 08:51:33 +0200
Subject: [PATCH] Fix IT for trimmed consumer POM (#293)

---
 .../expected/simple-weather.pom               |  7 ++-----
 .../expected/simple-webapp.pom                | 19 +++----------------
 .../expected/simple-testutils.pom             |  7 ++-----
 .../expected/simple-weather.pom               |  9 +++------
 .../expected/simple-webapp.pom                | 19 +++----------------
 5 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
index 75d9dc2b15..7a2682a09c 100644
--- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
+++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-weather.pom
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6656-SNAPSHOT</version>
-  </parent>
+  <groupId>org.sonatype.mavenbook.multi</groupId>
   <artifactId>simple-weather</artifactId>
+  <version>0.9-MNG6656-SNAPSHOT</version>
   <name>Multi Chapter Simple Weather API</name>
 </project>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
index ecd5348bf9..d7c6a6d32a 100644
--- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
+++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/expected/simple-webapp.pom
@@ -1,29 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6656-SNAPSHOT</version>
-  </parent>
+  <groupId>org.sonatype.mavenbook.multi</groupId>
   <artifactId>simple-webapp</artifactId>
+  <version>0.9-MNG6656-SNAPSHOT</version>
   <name>Multi Chapter Simple Web Application Project</name>
   <dependencies>
     <dependency>
       <groupId>org.sonatype.mavenbook.multi</groupId>
       <artifactId>simple-weather</artifactId>
       <version>0.9-MNG6656-SNAPSHOT</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <finalName>simple-webapp</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>3.3.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
index dddf561608..1007f7ecf2 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-testutils.pom
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    <artifactId>utils-parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
+  <groupId>org.sonatype.mavenbook.multi</groupId>
   <artifactId>simple-testutils</artifactId>
+  <version>0.9-MNG6957-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
index b7bbabb92b..cde80acde6 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-weather.pom
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
+  <groupId>org.sonatype.mavenbook.multi</groupId>
   <artifactId>simple-weather</artifactId>
+  <version>0.9-MNG6957-SNAPSHOT</version>
   <name>Multi Chapter Simple Weather API</name>
   <dependencies>
     <dependency>
@@ -16,4 +13,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
index 491e7bd9dc..95717ad66a 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/expected/simple-webapp.pom
@@ -1,29 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    <artifactId>simple-parent</artifactId>
-    <version>0.9-MNG6957-SNAPSHOT</version>
-  </parent>
+  <groupId>org.sonatype.mavenbook.multi</groupId>
   <artifactId>simple-webapp</artifactId>
+  <version>0.9-MNG6957-SNAPSHOT</version>
   <name>Multi Chapter Simple Web Application Project</name>
   <dependencies>
     <dependency>
       <groupId>org.sonatype.mavenbook.multi</groupId>
       <artifactId>simple-weather</artifactId>
       <version>0.9-MNG6957-SNAPSHOT</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <finalName>simple-webapp</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>3.3.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
\ No newline at end of file