From e5cd82a751b02fa1578e91ca21de271be03af3f7 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 6 Oct 2013 22:05:36 +0000
Subject: QPID-5048: remove the groupId from sub-modules, inherit
 org.apache.qpid from the parent

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529705 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/amqp-1-0-client-jms/pom.xml                      | 1 -
 qpid/java/amqp-1-0-client/pom.xml                          | 1 -
 qpid/java/amqp-1-0-common/pom.xml                          | 1 -
 qpid/java/bdbstore/jmx/pom.xml                             | 1 -
 qpid/java/bdbstore/pom.xml                                 | 1 -
 qpid/java/bdbstore/systests/pom.xml                        | 1 -
 qpid/java/broker-core/pom.xml                              | 1 -
 qpid/java/broker-plugins/access-control/pom.xml            | 1 -
 qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml        | 1 -
 qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml         | 1 -
 qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml         | 1 -
 qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml | 1 -
 qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml | 1 -
 qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml  | 1 -
 qpid/java/broker-plugins/derby-store/pom.xml               | 1 -
 qpid/java/broker-plugins/jdbc-provider-bone/pom.xml        | 1 -
 qpid/java/broker-plugins/jdbc-store/pom.xml                | 1 -
 qpid/java/broker-plugins/management-http/pom.xml           | 1 -
 qpid/java/broker-plugins/management-jmx/pom.xml            | 1 -
 qpid/java/broker-plugins/memory-store/pom.xml              | 1 -
 qpid/java/broker/pom.xml                                   | 1 -
 qpid/java/client/pom.xml                                   | 1 -
 qpid/java/common/pom.xml                                   | 1 -
 qpid/java/jca/pom.xml                                      | 1 -
 qpid/java/jca/rar/pom.xml                                  | 1 -
 qpid/java/management/common/pom.xml                        | 1 -
 qpid/java/management/example/pom.xml                       | 1 -
 qpid/java/perftests/pom.xml                                | 1 -
 qpid/java/perftests/visualisation-jfc/pom.xml              | 1 -
 qpid/java/pom.xml                                          | 1 -
 qpid/java/qpid-test-utils/pom.xml                          | 1 -
 qpid/java/systests/pom.xml                                 | 1 -
 qpid/java/tools/pom.xml                                    | 1 -
 33 files changed, 33 deletions(-)

diff --git a/qpid/java/amqp-1-0-client-jms/pom.xml b/qpid/java/amqp-1-0-client-jms/pom.xml
index 33103b561a..ffcfd223ae 100644
--- a/qpid/java/amqp-1-0-client-jms/pom.xml
+++ b/qpid/java/amqp-1-0-client-jms/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-amqp-1-0-client-jms</artifactId>
 
   <dependencies>
diff --git a/qpid/java/amqp-1-0-client/pom.xml b/qpid/java/amqp-1-0-client/pom.xml
index a54d813306..13430c0c22 100644
--- a/qpid/java/amqp-1-0-client/pom.xml
+++ b/qpid/java/amqp-1-0-client/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-amqp-1-0-client</artifactId>
 
   <dependencies>
diff --git a/qpid/java/amqp-1-0-common/pom.xml b/qpid/java/amqp-1-0-common/pom.xml
index 688dd82350..d771d58ab1 100644
--- a/qpid/java/amqp-1-0-common/pom.xml
+++ b/qpid/java/amqp-1-0-common/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-amqp-1-0-common</artifactId>
 
   <build>
diff --git a/qpid/java/bdbstore/jmx/pom.xml b/qpid/java/bdbstore/jmx/pom.xml
index 243903c8c4..3480460972 100644
--- a/qpid/java/bdbstore/jmx/pom.xml
+++ b/qpid/java/bdbstore/jmx/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-bdbstore-jmx</artifactId>
 
   <dependencies>
diff --git a/qpid/java/bdbstore/pom.xml b/qpid/java/bdbstore/pom.xml
index 34b108d6d7..cc3d2a8e26 100644
--- a/qpid/java/bdbstore/pom.xml
+++ b/qpid/java/bdbstore/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-bdbstore</artifactId>
 
   <dependencies>
diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml
index 3b7aa61943..5660b47085 100644
--- a/qpid/java/bdbstore/systests/pom.xml
+++ b/qpid/java/bdbstore/systests/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-bdbstore-systests</artifactId>
 
   <properties>
diff --git a/qpid/java/broker-core/pom.xml b/qpid/java/broker-core/pom.xml
index aa8bc71da1..7f7bc34aa4 100644
--- a/qpid/java/broker-core/pom.xml
+++ b/qpid/java/broker-core/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-core</artifactId>
 
   <properties>
diff --git a/qpid/java/broker-plugins/access-control/pom.xml b/qpid/java/broker-plugins/access-control/pom.xml
index 93b83897f3..c4b966d9ae 100644
--- a/qpid/java/broker-plugins/access-control/pom.xml
+++ b/qpid/java/broker-plugins/access-control/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-access-control</artifactId>
 
   <properties>
diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
index c3aeb7c93a..c24dd918e0 100644
--- a/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
+++ b/qpid/java/broker-plugins/amqp-0-10-protocol/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-amqp-0-10-protocol</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
index 23af0e6502..2e9954bc46 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-amqp-0-8-protocol</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
index 2825d3846e..31b42ef0e2 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
+++ b/qpid/java/broker-plugins/amqp-1-0-protocol/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-amqp-1-0-protocol</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
index 9bf96cb6bd..1403caee0a 100644
--- a/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-amqp-msg-conv-0-10-to-1-0</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
index afbfc7dab0..deccb6cf22 100644
--- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-0-10</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
index 9007b0a47a..ec725e7e57 100644
--- a/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
+++ b/qpid/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-amqp-msg-conv-0-8-to-1-0</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/derby-store/pom.xml b/qpid/java/broker-plugins/derby-store/pom.xml
index b491ce4b02..09bb66d589 100644
--- a/qpid/java/broker-plugins/derby-store/pom.xml
+++ b/qpid/java/broker-plugins/derby-store/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-derby-store</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
index 2ed148be25..ced20e165e 100644
--- a/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
+++ b/qpid/java/broker-plugins/jdbc-provider-bone/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-jdbc-provider-bone</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/jdbc-store/pom.xml b/qpid/java/broker-plugins/jdbc-store/pom.xml
index 3b7926ed82..cca9c301e0 100644
--- a/qpid/java/broker-plugins/jdbc-store/pom.xml
+++ b/qpid/java/broker-plugins/jdbc-store/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-jdbc-store</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml
index dfc56ff3f1..36925369fe 100644
--- a/qpid/java/broker-plugins/management-http/pom.xml
+++ b/qpid/java/broker-plugins/management-http/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-management-http</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/management-jmx/pom.xml b/qpid/java/broker-plugins/management-jmx/pom.xml
index a55ba64ef1..8fd525e7d6 100644
--- a/qpid/java/broker-plugins/management-jmx/pom.xml
+++ b/qpid/java/broker-plugins/management-jmx/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-management-jmx</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker-plugins/memory-store/pom.xml b/qpid/java/broker-plugins/memory-store/pom.xml
index a0cba5d38d..1cef06c1f0 100644
--- a/qpid/java/broker-plugins/memory-store/pom.xml
+++ b/qpid/java/broker-plugins/memory-store/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker-plugins-memory-store</artifactId>
 
   <dependencies>
diff --git a/qpid/java/broker/pom.xml b/qpid/java/broker/pom.xml
index 846b238626..7f09d5c046 100644
--- a/qpid/java/broker/pom.xml
+++ b/qpid/java/broker/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-broker</artifactId>
 
   <dependencies>
diff --git a/qpid/java/client/pom.xml b/qpid/java/client/pom.xml
index 12110441ce..e97b5b7a0d 100644
--- a/qpid/java/client/pom.xml
+++ b/qpid/java/client/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-client</artifactId>
 
   <dependencies>
diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml
index 437127af82..7aa4cd2a0c 100644
--- a/qpid/java/common/pom.xml
+++ b/qpid/java/common/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-common</artifactId>
 
   <properties>
diff --git a/qpid/java/jca/pom.xml b/qpid/java/jca/pom.xml
index f1c4ec5de3..467175db90 100644
--- a/qpid/java/jca/pom.xml
+++ b/qpid/java/jca/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-jca</artifactId>
 
   <dependencies>
diff --git a/qpid/java/jca/rar/pom.xml b/qpid/java/jca/rar/pom.xml
index ea8a4c9143..192f34255d 100644
--- a/qpid/java/jca/rar/pom.xml
+++ b/qpid/java/jca/rar/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-rar</artifactId>
   <packaging>rar</packaging>
 
diff --git a/qpid/java/management/common/pom.xml b/qpid/java/management/common/pom.xml
index 2489dd0680..ad5d103165 100644
--- a/qpid/java/management/common/pom.xml
+++ b/qpid/java/management/common/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-management-common</artifactId>
 
   <dependencies>
diff --git a/qpid/java/management/example/pom.xml b/qpid/java/management/example/pom.xml
index c5fd6566d8..bdddc3d2dc 100644
--- a/qpid/java/management/example/pom.xml
+++ b/qpid/java/management/example/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-management-examples</artifactId>
 
   <dependencies>
diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
index 455c69beda..25d0cce626 100644
--- a/qpid/java/perftests/pom.xml
+++ b/qpid/java/perftests/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-perftests</artifactId>
 
   <properties>
diff --git a/qpid/java/perftests/visualisation-jfc/pom.xml b/qpid/java/perftests/visualisation-jfc/pom.xml
index 5f0394f2f6..da84df1d2e 100644
--- a/qpid/java/perftests/visualisation-jfc/pom.xml
+++ b/qpid/java/perftests/visualisation-jfc/pom.xml
@@ -24,7 +24,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-perftests-visualisation-jfc</artifactId>
 
   <dependencies>
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml
index 99aac4703f..12dc22c9f1 100644
--- a/qpid/java/pom.xml
+++ b/qpid/java/pom.xml
@@ -34,7 +34,6 @@
       - Dont deploy modules we aren't already doing so.
     - Decide on name for this parent module.
     - Fix the version numbers in all the modules.
-    - Remove groupid from all the modules, if possible?
     - Align the XML in the pom files consistently, fix whitepsace errors.
     - Complete setting properties for the dependency version numbers.
     - Use dependancy management sections to control the version numbers.
diff --git a/qpid/java/qpid-test-utils/pom.xml b/qpid/java/qpid-test-utils/pom.xml
index 6ab08c90d6..4e90eb334c 100644
--- a/qpid/java/qpid-test-utils/pom.xml
+++ b/qpid/java/qpid-test-utils/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-test-utils</artifactId>
 
   <dependencies>
diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml
index 6dc319570b..62f1a89480 100644
--- a/qpid/java/systests/pom.xml
+++ b/qpid/java/systests/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-systests</artifactId>
 
   <properties>
diff --git a/qpid/java/tools/pom.xml b/qpid/java/tools/pom.xml
index 9c55a9e0f9..edc800a172 100644
--- a/qpid/java/tools/pom.xml
+++ b/qpid/java/tools/pom.xml
@@ -23,7 +23,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.apache.qpid</groupId>
   <artifactId>qpid-tools</artifactId>
 
   <dependencies>
-- 
cgit v1.2.1