From f257dd079885eb99c14e0e314e4f97c51c6c5072 Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Sat, 29 Mar 2008 02:01:11 +0000
Subject: change the group ID

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642482 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-base/archiva-artifact-converter/pom.xml    |  4 +-
 archiva-base/archiva-common/pom.xml                |  2 +-
 archiva-base/archiva-configuration/pom.xml         |  6 +--
 .../archiva-consumers/archiva-consumer-api/pom.xml |  6 +--
 .../archiva-core-consumers/pom.xml                 | 12 ++---
 .../archiva-database-consumers/pom.xml             | 12 ++---
 .../archiva-lucene-consumers/pom.xml               | 10 ++--
 .../archiva-signature-consumers/pom.xml            |  2 +-
 archiva-base/archiva-consumers/pom.xml             |  2 +-
 archiva-base/archiva-converter/pom.xml             |  8 +--
 archiva-base/archiva-dependency-graph/pom.xml      |  8 +--
 archiva-base/archiva-indexer/pom.xml               |  6 +--
 archiva-base/archiva-model/pom.xml                 |  4 +-
 archiva-base/archiva-policies/pom.xml              |  4 +-
 archiva-base/archiva-proxy/pom.xml                 |  6 +--
 archiva-base/archiva-repository-layer/pom.xml      | 12 ++---
 archiva-base/archiva-transaction/pom.xml           |  2 +-
 archiva-base/archiva-xml-tools/pom.xml             |  4 +-
 archiva-base/pom.xml                               |  3 +-
 archiva-build-resources/pom.xml                    |  8 +--
 archiva-cli/pom.xml                                |  8 +--
 archiva-database/pom.xml                           | 10 ++--
 archiva-docs/pom.xml                               |  2 +-
 archiva-reporting/archiva-artifact-reports/pom.xml |  8 +--
 archiva-reporting/archiva-metadata-reports/pom.xml |  8 +--
 archiva-reporting/archiva-project-reports/pom.xml  |  8 +--
 archiva-reporting/archiva-report-manager/pom.xml   |  6 +--
 archiva-reporting/pom.xml                          |  2 +-
 archiva-scheduled/pom.xml                          | 10 ++--
 archiva-web/archiva-applet/pom.xml                 |  2 +-
 archiva-web/archiva-security/pom.xml               |  4 +-
 .../archiva-standalone/archiva-jetty/pom.xml       |  6 +--
 archiva-web/archiva-standalone/pom.xml             |  2 +-
 archiva-web/archiva-webapp-test/pom.xml            |  4 +-
 archiva-web/archiva-webapp/pom.xml                 | 28 +++++-----
 archiva-web/archiva-webdav/pom.xml                 |  2 +-
 archiva-web/pom.xml                                |  2 +-
 pom.xml                                            | 61 +++++++++++-----------
 38 files changed, 146 insertions(+), 148 deletions(-)

diff --git a/archiva-base/archiva-artifact-converter/pom.xml b/archiva-base/archiva-artifact-converter/pom.xml
index 24b45dcc0..8f25d6dce 100644
--- a/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-base/archiva-artifact-converter/pom.xml
@@ -20,7 +20,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -43,7 +43,7 @@
       <version>2.0.4</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-transaction</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-common/pom.xml b/archiva-base/archiva-common/pom.xml
index 8205ade1b..de064e520 100644
--- a/archiva-base/archiva-common/pom.xml
+++ b/archiva-base/archiva-common/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
diff --git a/archiva-base/archiva-configuration/pom.xml b/archiva-base/archiva-configuration/pom.xml
index e22b7c84e..f42b65fdc 100644
--- a/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-base/archiva-configuration/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,11 +29,11 @@
   <name>Archiva Base :: Configuration</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-policies</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index d80ed5a56..cde8fb7cb 100644
--- a/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++ b/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -30,11 +30,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 62659030f..ad190b22d 100644
--- a/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -30,23 +30,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-indexer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
index 643910a54..2900a3218 100644
--- a/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
+++ b/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -30,23 +30,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-artifact-reports</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 7437e12d2..6335bfcce 100644
--- a/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -30,19 +30,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-indexer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
   </dependencies>
diff --git a/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml b/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
index 743626644..e240916aa 100644
--- a/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
+++ b/archiva-base/archiva-consumers/archiva-signature-consumers/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-consumers</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/archiva-base/archiva-consumers/pom.xml b/archiva-base/archiva-consumers/pom.xml
index 36f6082a8..2e62ef12e 100644
--- a/archiva-base/archiva-consumers/pom.xml
+++ b/archiva-base/archiva-consumers/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/archiva-base/archiva-converter/pom.xml b/archiva-base/archiva-converter/pom.xml
index 550902010..162bd6aad 100644
--- a/archiva-base/archiva-converter/pom.xml
+++ b/archiva-base/archiva-converter/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,15 +29,15 @@
   <name>Archiva Base :: Repository Converter</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-artifact-converter</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-dependency-graph/pom.xml b/archiva-base/archiva-dependency-graph/pom.xml
index ba1b4c905..4fc3fd497 100644
--- a/archiva-base/archiva-dependency-graph/pom.xml
+++ b/archiva-base/archiva-dependency-graph/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,15 +29,15 @@
   <name>Archiva Base :: Dependency Graph</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-xml-tools</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-indexer/pom.xml b/archiva-base/archiva-indexer/pom.xml
index e1bf0846b..4c7a7b398 100644
--- a/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-base/archiva-indexer/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,11 +29,11 @@
   <name>Archiva Base :: Indexer</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-model/pom.xml b/archiva-base/archiva-model/pom.xml
index 14c95acdd..86a974ede 100755
--- a/archiva-base/archiva-model/pom.xml
+++ b/archiva-base/archiva-model/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,7 +29,7 @@
   <name>Archiva Base :: Model</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-common</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-policies/pom.xml b/archiva-base/archiva-policies/pom.xml
index 834cbe8a0..779745f83 100644
--- a/archiva-base/archiva-policies/pom.xml
+++ b/archiva-base/archiva-policies/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,7 +29,7 @@
   <name>Archiva Base :: Policies</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-common</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-proxy/pom.xml b/archiva-base/archiva-proxy/pom.xml
index 2dc32b1ae..a943b91f5 100644
--- a/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-base/archiva-proxy/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -34,11 +34,11 @@
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-repository-layer/pom.xml b/archiva-base/archiva-repository-layer/pom.xml
index 7877f44a6..b1fdae0c0 100644
--- a/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-base/archiva-repository-layer/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -34,23 +34,23 @@
         <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-dependency-graph</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-xml-tools</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/archiva-transaction/pom.xml b/archiva-base/archiva-transaction/pom.xml
index 88a3e2af7..bcfdb5ac2 100644
--- a/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-base/archiva-transaction/pom.xml
@@ -20,7 +20,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
diff --git a/archiva-base/archiva-xml-tools/pom.xml b/archiva-base/archiva-xml-tools/pom.xml
index c6d4e5e91..a2264a1f0 100644
--- a/archiva-base/archiva-xml-tools/pom.xml
+++ b/archiva-base/archiva-xml-tools/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-base</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,7 +29,7 @@
   <name>Archiva Base :: XML Tools</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-common</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-base/pom.xml b/archiva-base/pom.xml
index edc334081..e0387a822 100644
--- a/archiva-base/pom.xml
+++ b/archiva-base/pom.xml
@@ -18,10 +18,9 @@
 <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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
     <version>1.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>archiva-base</artifactId>
diff --git a/archiva-build-resources/pom.xml b/archiva-build-resources/pom.xml
index 20efb9130..206c7bb15 100644
--- a/archiva-build-resources/pom.xml
+++ b/archiva-build-resources/pom.xml
@@ -18,12 +18,12 @@
 <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>
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>5</version>
+    <groupId>org.apache.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
+    <version>3-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.maven.archiva</groupId>
+  <groupId>org.apache.archiva</groupId>
   <artifactId>archiva-build-resources</artifactId>
   <version>1-SNAPSHOT</version>
   <name>Archiva Build Resources</name>
diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 52673b083..cf746ec41 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -30,15 +30,15 @@
   <name>Archiva Command Line Client</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-core-consumers</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-converter</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-database/pom.xml b/archiva-database/pom.xml
index e1ed92883..e4eaea4f7 100755
--- a/archiva-database/pom.xml
+++ b/archiva-database/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -30,19 +30,19 @@
   <name>Archiva Database</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-model</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index 68d67ac08..334ca5efd 100644
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -19,7 +19,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
diff --git a/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-reporting/archiva-artifact-reports/pom.xml
index 24f368452..9ae30f777 100755
--- a/archiva-reporting/archiva-artifact-reports/pom.xml
+++ b/archiva-reporting/archiva-artifact-reports/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,15 +29,15 @@
   <name>Archiva Reporting :: Artifact Reports</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-reporting/archiva-metadata-reports/pom.xml
index f081fb95d..b3094b761 100755
--- a/archiva-reporting/archiva-metadata-reports/pom.xml
+++ b/archiva-reporting/archiva-metadata-reports/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,15 +29,15 @@
   <name>Archiva Reporting :: Metadata Reports</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-reporting/archiva-project-reports/pom.xml b/archiva-reporting/archiva-project-reports/pom.xml
index a12a34c69..0241a80de 100755
--- a/archiva-reporting/archiva-project-reports/pom.xml
+++ b/archiva-reporting/archiva-project-reports/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,15 +29,15 @@
   <name>Archiva Reporting :: Project Reports</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-reporting/archiva-report-manager/pom.xml b/archiva-reporting/archiva-report-manager/pom.xml
index 5e1c7fe9e..1d2f9d86f 100755
--- a/archiva-reporting/archiva-report-manager/pom.xml
+++ b/archiva-reporting/archiva-report-manager/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-reporting</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,11 +29,11 @@
   <name>Archiva Reporting :: Report Manager</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-reporting/pom.xml b/archiva-reporting/pom.xml
index 16b32c8dc..28cab2353 100644
--- a/archiva-reporting/pom.xml
+++ b/archiva-reporting/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/archiva-scheduled/pom.xml b/archiva-scheduled/pom.xml
index 0b10132af..364e89a01 100644
--- a/archiva-scheduled/pom.xml
+++ b/archiva-scheduled/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -30,15 +30,15 @@
   <name>Archiva Base :: Scheduled Tasks</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
@@ -67,7 +67,7 @@
     </dependency>
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database-consumers</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-web/archiva-applet/pom.xml b/archiva-web/archiva-applet/pom.xml
index 14f912f93..b9cbb1710 100644
--- a/archiva-web/archiva-applet/pom.xml
+++ b/archiva-web/archiva-applet/pom.xml
@@ -21,7 +21,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
diff --git a/archiva-web/archiva-security/pom.xml b/archiva-web/archiva-security/pom.xml
index 8eb5f05e4..64288308b 100644
--- a/archiva-web/archiva-security/pom.xml
+++ b/archiva-web/archiva-security/pom.xml
@@ -20,7 +20,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">
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -29,7 +29,7 @@
   <name>Archiva Web :: Security Configuration</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-configuration</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-web/archiva-standalone/archiva-jetty/pom.xml b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
index c766dc3d0..95f605f21 100644
--- a/archiva-web/archiva-standalone/archiva-jetty/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-jetty/pom.xml
@@ -2,7 +2,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web-standalone</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
@@ -22,12 +22,12 @@
       <version>6.1.6</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-webapp</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-docs</artifactId>
       <type>zip</type>
       <classifier>docs</classifier>
diff --git a/archiva-web/archiva-standalone/pom.xml b/archiva-web/archiva-standalone/pom.xml
index 743731fde..c787bf24c 100644
--- a/archiva-web/archiva-standalone/pom.xml
+++ b/archiva-web/archiva-standalone/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/archiva-web/archiva-webapp-test/pom.xml b/archiva-web/archiva-webapp-test/pom.xml
index fefe0a3c1..e88468971 100644
--- a/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-web/archiva-webapp-test/pom.xml
@@ -22,7 +22,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
     <version>1.0-alpha-3-SNAPSHOT</version>
   </parent>
@@ -35,7 +35,7 @@
       <artifactId>plexus-command-line</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-webapp</artifactId>
       <type>war</type>
     </dependency>
diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index 38afffcb9..7e0f20374 100644
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -21,7 +21,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -31,51 +31,51 @@
   <name>Archiva Web :: Application</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-report-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-scheduled</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-indexer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-proxy</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-core-consumers</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-database-consumers</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-lucene-consumers</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-signature-consumers</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-applet</artifactId>
       <!-- TODO: actually, just exclude from WAR plugin -->
       <scope>provided</scope>
@@ -181,7 +181,7 @@
     </dependency>
     <!-- Other dependencies -->
     <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
+      <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-webdav</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-web/archiva-webdav/pom.xml b/archiva-web/archiva-webdav/pom.xml
index fa863c017..9a4e48b3d 100644
--- a/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-web/archiva-webdav/pom.xml
@@ -21,7 +21,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-web</artifactId>
     <version>1.1-SNAPSHOT</version>
   </parent>
diff --git a/archiva-web/pom.xml b/archiva-web/pom.xml
index 21aa1d08d..c8eb9d2f4 100644
--- a/archiva-web/pom.xml
+++ b/archiva-web/pom.xml
@@ -18,7 +18,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>
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva</artifactId>
     <version>1.1-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
diff --git a/pom.xml b/pom.xml
index bd3de1f75..eb3c86b6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,10 +26,9 @@
   </prerequisites>
 
   <parent>
-    <groupId>org.apache.maven.archiva</groupId>
+    <groupId>org.apache.archiva</groupId>
     <artifactId>archiva-parent</artifactId>
-    <version>2</version>
-    <relativePath>../archiva-parent/pom.xml</relativePath>
+    <version>3-SNAPSHOT</version>
   </parent>
   <name>Archiva</name>
   <artifactId>archiva</artifactId>
@@ -211,146 +210,146 @@
         <version>1.1</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-applet</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-artifact-converter</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-artifact-reports</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-common</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-configuration</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-consumer-api</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-converter</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-dependency-graph</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-core</artifactId>
         <version>${pom.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-core-consumers</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-database</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-database-consumers</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-indexer</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-lucene-consumers</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-model</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-plexus-application</artifactId>
         <version>1.1-SNAPSHOT</version>
         <type>plexus-application</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-policies</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-proxy</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-report-manager</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-repository-layer</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-scheduled</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-security</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-signature-consumers</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-transaction</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-docs</artifactId>
         <version>1.1-SNAPSHOT</version>
         <type>zip</type>
         <classifier>docs</classifier>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webapp</artifactId>
         <version>1.1-SNAPSHOT</version>
         <type>war</type>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-xml-tools</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.apache.maven.archiva</groupId>
+        <groupId>org.apache.archiva</groupId>
         <artifactId>archiva-webdav</artifactId>
         <version>1.1-SNAPSHOT</version>
       </dependency>
-- 
cgit v1.2.3