[MNG-8252] Test parent inference and subprojects detection (#360)

apache · Sep 11, 2024 · cf3eae9 · cf3eae9
1 parent 1e803a6
commit cf3eae9
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 41 deletions.
diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml
@@ -23,9 +23,4 @@ under the License.
   <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/simple-parent/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml
@@ -18,19 +18,11 @@ 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>parent</artifactId>
-  </parent>
+  <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>

diff --git a/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml
@@ -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/simple-parent/simple-webapp/pom.xml b/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml
@@ -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/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml
@@ -24,9 +24,4 @@ under the License.
   <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/...it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml b/...it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
@@ -20,8 +20,6 @@ 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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <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/simple-parent/simple-weather/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
@@ -19,10 +19,7 @@ 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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <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/simple-parent/simple-webapp/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
@@ -19,10 +19,7 @@ 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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <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/simple-parent/utils-parent/pom.xml b/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
@@ -19,10 +19,7 @@ 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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.mavenbook.multi</groupId>
-    <artifactId>simple-parent</artifactId>
-  </parent>
+  <parent />
   <artifactId>utils-parent</artifactId>
   <packaging>pom</packaging>
 </project>