diff --git a/build.xml b/build.xml
index d8ada5fd1..0118badd9 100644
--- a/build.xml
+++ b/build.xml
@@ -32,6 +32,8 @@
   -->
   <property name="Name" value="Apache Ant"/>
   <property name="name" value="ant"/>
+  <!-- this is the groupId of ant in the Maven repository -->
+  <property name="groupid" value="org.apache.ant"/>
   <property name="project.version" value="1.7.0Beta3"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
   <property name="pom.version" value="1.7.0-SNAPSHOT"/>
@@ -153,7 +155,7 @@
   <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
   <property name="src.dist.lib" value="${src.dist.dir}/lib"/>
 
-  <property name="java-repository.dir" value="java-repository/${name}"/>
+  <property name="java-repository.dir" value="java-repository/${groupid}"/>
   <property name="java-repository.jars.dir" value="${java-repository.dir}/jars"/>
   <property name="java-repository.poms.dir" value="${java-repository.dir}/poms"/>
 
diff --git a/src/etc/poms/ant-antlr/pom.xml b/src/etc/poms/ant-antlr/pom.xml
index 781a4f42b..396a641f6 100644
--- a/src/etc/poms/ant-antlr/pom.xml
+++ b/src/etc/poms/ant-antlr/pom.xml
@@ -3,20 +3,20 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-antlr</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>antlr specific task.
     The implementation forks a java process, therefore the antlr jar file is only needed at runtime</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <optional>true</optional>
diff --git a/src/etc/poms/ant-apache-bcel/pom.xml b/src/etc/poms/ant-apache-bcel/pom.xml
index dc8af0803..372664b9e 100644
--- a/src/etc/poms/ant-apache-bcel/pom.xml
+++ b/src/etc/poms/ant-apache-bcel/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bcel</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-apache-bsf/pom.xml b/src/etc/poms/ant-apache-bsf/pom.xml
index d476c48df..d594ec50e 100644
--- a/src/etc/poms/ant-apache-bsf/pom.xml
+++ b/src/etc/poms/ant-apache-bsf/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-bsf</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-apache-log4j/pom.xml b/src/etc/poms/ant-apache-log4j/pom.xml
index d58ae26a3..51877b0b7 100644
--- a/src/etc/poms/ant-apache-log4j/pom.xml
+++ b/src/etc/poms/ant-apache-log4j/pom.xml
@@ -2,18 +2,18 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-log4j</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-apache-oro/pom.xml b/src/etc/poms/ant-apache-oro/pom.xml
index d48893b16..f40a12c5e 100644
--- a/src/etc/poms/ant-apache-oro/pom.xml
+++ b/src/etc/poms/ant-apache-oro/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-oro</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-apache-regexp/pom.xml b/src/etc/poms/ant-apache-regexp/pom.xml
index a21a4e333..69dccaa7a 100644
--- a/src/etc/poms/ant-apache-regexp/pom.xml
+++ b/src/etc/poms/ant-apache-regexp/pom.xml
@@ -2,18 +2,18 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-regexp</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-apache-resolver/pom.xml b/src/etc/poms/ant-apache-resolver/pom.xml
index 256903b6f..dfde4bfdf 100644
--- a/src/etc/poms/ant-apache-resolver/pom.xml
+++ b/src/etc/poms/ant-apache-resolver/pom.xml
@@ -2,18 +2,18 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-apache-resolver</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-commons-logging/pom.xml b/src/etc/poms/ant-commons-logging/pom.xml
index 4d4a64946..58309aa9b 100644
--- a/src/etc/poms/ant-commons-logging/pom.xml
+++ b/src/etc/poms/ant-commons-logging/pom.xml
@@ -2,19 +2,19 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-logging</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>Ant Listener based on commons-logging</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-commons-net/pom.xml b/src/etc/poms/ant-commons-net/pom.xml
index 357d7d9e6..baa830a74 100644
--- a/src/etc/poms/ant-commons-net/pom.xml
+++ b/src/etc/poms/ant-commons-net/pom.xml
@@ -2,19 +2,19 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-commons-net</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>ftp, rexec and telnet tasks</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-jai/pom.xml b/src/etc/poms/ant-jai/pom.xml
index 2a451dfcc..dd0b6ebb9 100644
--- a/src/etc/poms/ant-jai/pom.xml
+++ b/src/etc/poms/ant-jai/pom.xml
@@ -3,13 +3,13 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-jai</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>image task and corresponding types.
@@ -18,7 +18,7 @@
   </description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-javamail/pom.xml b/src/etc/poms/ant-javamail/pom.xml
index ebf054e94..1e2f5edc7 100644
--- a/src/etc/poms/ant-javamail/pom.xml
+++ b/src/etc/poms/ant-javamail/pom.xml
@@ -2,13 +2,13 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-javamail</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>implementation of the mail task based on javamail.
@@ -16,7 +16,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
   or to send mail over SSL</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml
index 6cdba1482..919ab4985 100644
--- a/src/etc/poms/ant-jdepend/pom.xml
+++ b/src/etc/poms/ant-jdepend/pom.xml
@@ -3,20 +3,20 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-jdepend</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>task jdepend invoking the jdepend parser. There is also a version 2.9.1 of the
     jdepend parser available on the maven repository</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-jmf/pom.xml b/src/etc/poms/ant-jmf/pom.xml
index a8cf025d4..ab5c75805 100644
--- a/src/etc/poms/ant-jmf/pom.xml
+++ b/src/etc/poms/ant-jmf/pom.xml
@@ -2,20 +2,20 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-jmf</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>contains the sound task and a soundplayer listener
     download the dependency from http://java.sun.com/products/java-media/jmf/</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-jsch/pom.xml b/src/etc/poms/ant-jsch/pom.xml
index eae52b921..74565f808 100644
--- a/src/etc/poms/ant-jsch/pom.xml
+++ b/src/etc/poms/ant-jsch/pom.xml
@@ -2,20 +2,20 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-jsch</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>contains the sshexec and scp tasks
   jsch 0.1.29 might not be available from maven</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index 9d706e0d8..2f1f418e2 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -2,19 +2,19 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-junit</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>contains the junit and junirreport tasks</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-launcher/pom.xml b/src/etc/poms/ant-launcher/pom.xml
index bd017941b..c75f3f43e 100644
--- a/src/etc/poms/ant-launcher/pom.xml
+++ b/src/etc/poms/ant-launcher/pom.xml
@@ -3,13 +3,13 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-launcher</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <build>
diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml
index 5ddf1e08c..cfb0ca82d 100644
--- a/src/etc/poms/ant-netrexx/pom.xml
+++ b/src/etc/poms/ant-netrexx/pom.xml
@@ -2,20 +2,20 @@
 <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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-netrexx</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>NetRexxC task
     dependency can be downloaded from http://www.ibm.com/software/awdtools/netrexx/download.html</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-nodeps/pom.xml b/src/etc/poms/ant-nodeps/pom.xml
index 4c9fa1207..b900c113c 100644
--- a/src/etc/poms/ant-nodeps/pom.xml
+++ b/src/etc/poms/ant-nodeps/pom.xml
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-nodeps</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>contains all the optional tasks and types which do not have particular dependencies</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-starteam/pom.xml b/src/etc/poms/ant-starteam/pom.xml
index 8d5c70d7d..e04dad854 100644
--- a/src/etc/poms/ant-starteam/pom.xml
+++ b/src/etc/poms/ant-starteam/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-starteam</artifactId>
   <description>Starteam SDK tasks</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-stylebook/pom.xml b/src/etc/poms/ant-stylebook/pom.xml
index bc9b5c068..77e69364c 100644
--- a/src/etc/poms/ant-stylebook/pom.xml
+++ b/src/etc/poms/ant-stylebook/pom.xml
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-stylebook</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>executes the Apache Stylebook document generator. Deprecated since Ant 1.7</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-swing/pom.xml b/src/etc/poms/ant-swing/pom.xml
index 8bd039682..fa84f4395 100644
--- a/src/etc/poms/ant-swing/pom.xml
+++ b/src/etc/poms/ant-swing/pom.xml
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-swing</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>a listener and a splash task based on Swing</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-trax/pom.xml b/src/etc/poms/ant-trax/pom.xml
index 3a4b34f95..d5e0cea11 100644
--- a/src/etc/poms/ant-trax/pom.xml
+++ b/src/etc/poms/ant-trax/pom.xml
@@ -3,19 +3,19 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-trax</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <description>contains particularly one class necessary for the execution of the xslt task</description>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant-weblogic/pom.xml b/src/etc/poms/ant-weblogic/pom.xml
index 8335102c6..cb60c8ba4 100644
--- a/src/etc/poms/ant-weblogic/pom.xml
+++ b/src/etc/poms/ant-weblogic/pom.xml
@@ -3,18 +3,18 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-weblogic</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index 0902f289c..304b7de8a 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -3,13 +3,13 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>ant</groupId>
+    <groupId>org.apache.ant</groupId>
     <artifactId>ant-parent</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>1.7.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <name>org.apache.tools.ant</name>
@@ -19,7 +19,7 @@
       <!-- the implementation jar of the xerces jar will be used by ant to parse
         XML files, particularly the build files, if the JDK does not provide a parser
         xercesImpl.jar is provided with ant -->
-      <groupId>ant</groupId>
+      <groupId>org.apache.ant</groupId>
       <artifactId>ant-launcher</artifactId>
       <version>1.7.0-SNAPSHOT</version>
       <scope>compile</scope>
diff --git a/src/etc/poms/pom.xml b/src/etc/poms/pom.xml
index 7e0a6e33b..5e8e45d29 100644
--- a/src/etc/poms/pom.xml
+++ b/src/etc/poms/pom.xml
@@ -2,7 +2,7 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ant</groupId>
+  <groupId>org.apache.ant</groupId>
   <artifactId>ant-parent</artifactId>
   <version>1.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>