change the group ID

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@642482 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-base/archiva-artifact-converter/pom.xml b/archiva-base/archiva-artifact-converter/pom.xml
index 24b45dcc0ade52467805dce2093c3e8e6cc74429..8f25d6dced547f4a8750ccda6dfac58170d323cd 100644 (file)
--- 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 8205ade1b0517ba5cf10c14c0d2df2fd511760a8..de064e520f8f84d8fa7f132611b9f5d10ddd99fd 100644 (file)
--- 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 e22b7c84e475a632a0fdf7296650ee44c2f2818a..f42b65fdccf9a76eb84aab957c58cab5ad624e7d 100644 (file)
--- 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 d80ed5a56ae444bde2ced9e6f197c0aa58f605dd..cde8fb7cb4b1881232f68ac4f4993e862eab8dde 100644 (file)
--- 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 62659030f4674bf4661673b7fecd9b71de2f3524..ad190b22d385f477d8ec899aacfab0277519a2a1 100644 (file)
--- 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 643910a54521ebad145b1c19a20fe508e994ea4f..2900a3218124d4829bb3688c2f16615340b1832d 100644 (file)
--- 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 7437e12d2cc6c592fedc09f43ad2008b0b138600..6335bfcce82eda07b6f8370df280b69b47837bbf 100644 (file)
--- 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 743626644f59b8510e8e19f51209422b3cfc6fd1..e240916aa10b03182adc23d3e1bc05d2e5b85d26 100644 (file)
--- 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 36f6082a8d1fc493e22393fad2ece3c376eaf4e3..2e62ef12e538cd0a420c0d76d7de5a767b4b6b2f 100644 (file)
--- 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 550902010a864779b4aa9493c0e19c9b11881e7b..162bd6aada2ec2bd669dc48ba62dba63b4e40cc1 100644 (file)
--- 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 ba1b4c9055ebc4b3f0f0e28bba90843ee80037ee..4fc3fd4978accce6dce4328f924e84c66f2ba43a 100644 (file)
--- 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 e1bf0846b157fc8458be883bce4cfb1fa43e8d08..4c7a7b398b052a7539dfc72577ad7638f656b053 100644 (file)
--- 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 14c95acdd75480ba2f895727239ddc9e42246750..86a974edee191c772e928a686d547b0bab49ae34 100755 (executable)
--- 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 834cbe8a01ca4d0554ac4cf6c32e03fdaa20a109..779745f83a134cffcd12af2c71a5bac19b48124c 100644 (file)
--- 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 2dc32b1ae535013b7dbd89d518bb3c461e04b800..a943b91f58d2ea6bfd862cda2788699cc198747c 100644 (file)
--- 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 7877f44a62871896f054c3201e8babf34dd3b1c8..b1fdae0c0d4f06e5204ee330279daa169abf8126 100644 (file)
--- 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 88a3e2af79177517ff424aef373741dd29de1076..bcfdb5ac24ded051b31579cbc3a6c2c76fb1ab89 100644 (file)
--- 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 c6d4e5e91abcc62053e0f4ce951ff0265adb519a..a2264a1f03e781b630edc87fdd2e2ba275690634 100644 (file)
--- 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 edc334081cc8e8a924e932f499ef53d728bbd3f3..e0387a822a41067ec46f1954a99b8d4896094cbd 100644 (file)
--- 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 20efb913066d9745ad8e5784d52bde7fe63c8008..206c7bb15c155cda3d743a49a9333dd504950b61 100644 (file)
--- 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 52673b0836a40333faf94066ba8998f574e67ad1..cf746ec41db49424b183a9903da745325ef3fdd1 100644 (file)
--- 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 e1ed9288389d6b7d22c67f664fed9f1b2770cbe6..e4eaea4f72ef17e7e447f68841f678431f299ff0 100755 (executable)
--- 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 68d67ac0813d14982f06d9f9f2e74ac65b7ee3da..334ca5efd76bf12f927c5399821de6153c2761c4 100644 (file)
--- 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 24f3684529329236a26bc4c7bc66606047a166f7..9ae30f777a37db951510c126ed04424956e48187 100755 (executable)
--- 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 f081fb95dbbad1a349871358721d22d5ef0fb553..b3094b761e05c09b5976320c0f3d16e3f83f1206 100755 (executable)
--- 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 a12a34c69727e4c456b062453572f5127ca10bad..0241a80de1b4214adbe2cb95ff91747ae08214ac 100755 (executable)
--- 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 5e1c7fe9ea698d3b304f6bd90104f3e199cf61fd..1d2f9d86fdf9d65d065fc690f492e49857ff8fc4 100755 (executable)
--- 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 16b32c8dc8a8d4302b4176083e3b208b39bc036d..28cab23538455d8cde5c6215dff8170c13b2bbb1 100644 (file)
--- 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 0b10132af570a11f193c6e448c911b63251c6089..364e89a01ad50255e3c5a99750468df780d0b038 100644 (file)
--- 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 14f912f932fb624f7cc06f59790284d08f7625a9..b9cbb1710037702a1d0994a1b67dbcad24a51d6c 100644 (file)
--- 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 8eb5f05e4acd3f3f2d70f8e829b4c3ac1c40c22b..64288308bccedff2e9f888df5299cf8de0b76877 100644 (file)
--- 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 c766dc3d0b3d1f15b2665659e3d09d0739a67d96..95f605f21e8176f6cc0f5135f9b8b8f36871b6e7 100644 (file)
--- 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 743731fde1dd621b9d559936f11884b522522e78..c787bf24cf8653738ed79150a76257c65450222a 100644 (file)
--- 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 fefe0a3c1ed751f3f9beef573f0855bf8a34374c..e884689718b666a02de729d1c5965b8717160fc4 100644 (file)
--- 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 38afffcb9bdb409da2619d1ef21c5d4a0fab1330..7e0f20374f0f99e3d4879daf081f93d111a54f38 100644 (file)
--- 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 fa863c01779e44a8c2260f62e7bb9080afa74c9c..9a4e48b3dee5f78212c399f8ca8f7794cd75c0ba 100644 (file)
--- 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 21aa1d08d5566fa4050b17cb3e543a2689e9a911..c8eb9d2f4706526fc98d8dc2087a610ab726d616 100644 (file)
--- 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 bd3de1f75ace864fa57940fcbe8ef8dce786f7e8..eb3c86b6dc3268f036728c2859804df3e2c5f968 100644 (file)
--- 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>