finished change of groupId from o.a.maven to o.a.maven.aether
diff --git a/aether-connector-basic/pom.xml b/aether-connector-basic/pom.xml
index d7c1e0b..874b6fd 100644
--- a/aether-connector-basic/pom.xml
+++ b/aether-connector-basic/pom.xml
@@ -33,15 +33,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-util</artifactId>
     </dependency>
     <dependency>
@@ -67,7 +67,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-test-util</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/aether-impl/pom.xml b/aether-impl/pom.xml
index 8a77b2b..05a0852 100644
--- a/aether-impl/pom.xml
+++ b/aether-impl/pom.xml
@@ -33,15 +33,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-util</artifactId>
     </dependency>
     <dependency>
@@ -80,7 +80,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-test-util</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/aether-spi/pom.xml b/aether-spi/pom.xml
index f76b9f9..443552b 100644
--- a/aether-spi/pom.xml
+++ b/aether-spi/pom.xml
@@ -33,7 +33,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
diff --git a/aether-test-util/pom.xml b/aether-test-util/pom.xml
index ff16d48..1da4d98 100644
--- a/aether-test-util/pom.xml
+++ b/aether-test-util/pom.xml
@@ -33,11 +33,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-spi</artifactId>
     </dependency>
     <dependency>
diff --git a/aether-transport-classpath/pom.xml b/aether-transport-classpath/pom.xml
index b3be774..af4ed92 100644
--- a/aether-transport-classpath/pom.xml
+++ b/aether-transport-classpath/pom.xml
@@ -33,15 +33,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-util</artifactId>
     </dependency>
     <dependency>
@@ -67,7 +67,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-test-util</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/aether-transport-file/pom.xml b/aether-transport-file/pom.xml
index 7ec7ffe..f213380 100644
--- a/aether-transport-file/pom.xml
+++ b/aether-transport-file/pom.xml
@@ -33,15 +33,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-util</artifactId>
     </dependency>
     <dependency>
@@ -67,7 +67,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-test-util</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/aether-transport-http/pom.xml b/aether-transport-http/pom.xml
index d84236b..049e0bf 100644
--- a/aether-transport-http/pom.xml
+++ b/aether-transport-http/pom.xml
@@ -33,15 +33,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-util</artifactId>
     </dependency>
     <dependency>
@@ -84,7 +84,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-test-util</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/aether-transport-wagon/pom.xml b/aether-transport-wagon/pom.xml
index 6108045..58fceae 100644
--- a/aether-transport-wagon/pom.xml
+++ b/aether-transport-wagon/pom.xml
@@ -34,15 +34,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-util</artifactId>
     </dependency>
     <dependency>
@@ -96,7 +96,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-test-util</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/aether-util/pom.xml b/aether-util/pom.xml
index 47d660f..762264d 100644
--- a/aether-util/pom.xml
+++ b/aether-util/pom.xml
@@ -33,11 +33,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven</groupId>
+      <groupId>org.apache.maven.aether</groupId>
       <artifactId>aether-test-util</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index fc535f7..a18b523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,32 +139,32 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.aether</groupId>
         <artifactId>aether-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.aether</groupId>
         <artifactId>aether-spi</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.aether</groupId>
         <artifactId>aether-util</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.aether</groupId>
         <artifactId>aether-impl</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.aether</groupId>
         <artifactId>aether-connector-basic</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven</groupId>
+        <groupId>org.apache.maven.aether</groupId>
         <artifactId>aether-test-util</artifactId>
         <version>${project.version}</version>
         <scope>test</scope>
@@ -529,7 +529,7 @@
                     <exclude>*:*</exclude>
                   </excludes>
                   <includes>
-                    <include>org.eclipse.aether</include>
+                    <include>org.apache.maven.aether</include>
                     <include>org.eclipse.sisu</include>
                     <include>org.eclipse.jetty:*:*:*:test</include>
                     <!-- CQ #5627 -->