[MNG-8577] Project POM hierarchy (#2104)

And some other minor formatting cleanup.

---

https://issues.apache.org/jira/browse/MNG-8577

Author: cstamas

api/maven-api-metadata/pom.xml

@@ -19,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-api</artifactId>

api/maven-api-plugin/pom.xml

@@ -19,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-api</artifactId>

api/maven-api-toolchain/pom.xml

@@ -19,6 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-api</artifactId>

compat/maven-artifact/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-artifact</artifactId>

compat/maven-builder-support/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-builder-support</artifactId>

compat/maven-compat/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-compat</artifactId>

compat/maven-embedder/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-embedder</artifactId>

compat/maven-model-builder/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-model-builder</artifactId>

compat/maven-model/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-model</artifactId>

compat/maven-plugin-api/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-plugin-api</artifactId>

compat/maven-repository-metadata/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-repository-metadata</artifactId>

compat/maven-resolver-provider/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-resolver-provider</artifactId>

compat/maven-settings-builder/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-settings-builder</artifactId>

compat/maven-settings/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-settings</artifactId>

compat/maven-toolchain-builder/pom.xml

@@ -19,12 +19,11 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-toolchain-builder</artifactId>

compat/maven-toolchain-model/pom.xml

@@ -19,12 +19,11 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-compat-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-toolchain-model</artifactId>

impl/maven-cli/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-cli</artifactId>
@@ -188,11 +186,6 @@ under the License.
       <optional>true</optional>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
@@ -208,6 +201,11 @@ under the License.
       <artifactId>jimfs</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-compat</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.resolver</groupId>
       <artifactId>maven-resolver-connector-basic</artifactId>

impl/maven-core/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-core</artifactId>

impl/maven-di/pom.xml

@@ -19,12 +19,11 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-di</artifactId>

impl/maven-executor/pom.xml

@@ -22,10 +22,8 @@ under the License.
 
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-executor</artifactId>

impl/maven-impl/pom.xml

@@ -19,12 +19,11 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-impl</artifactId>

impl/maven-jline/pom.xml

@@ -19,12 +19,11 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-jline</artifactId>

impl/maven-logging/pom.xml

@@ -19,12 +19,11 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-logging</artifactId>

impl/maven-xml/pom.xml

@@ -19,12 +19,11 @@ 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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
+    <artifactId>maven-impl-modules</artifactId>
     <version>4.0.0-rc-3-SNAPSHOT</version>
-
-    <relativePath>../../</relativePath>
   </parent>
 
   <artifactId>maven-xml</artifactId>