Organise pom structure into corrected hierarchy

All child modules are now properly grouped under each parent.
This should allow the Jenkins update version plugin to update
the version of all child modules and allow the staging deployment
of the champ-service releasable artifact.

Change-Id: I6ecae622654e736f65691d9fa4357d27e606c801
Issue-ID: AAI-1146
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>

8 files changed, 32 insertions, 21 deletions

diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml
index d528a0f..484953f 100644
--- a/champ-lib/champ-core/pom.xml
+++ b/champ-lib/champ-core/pom.xml
@@ -25,11 +25,12 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.aai</groupId>
+        <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
         <version>1.2.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ.champ-lib</groupId>
     <artifactId>champ-core</artifactId>
 
     <dependencies>
diff --git a/champ-lib/champ-janus/pom.xml b/champ-lib/champ-janus/pom.xml
index 1a6f7d6..53b2e65 100644
--- a/champ-lib/champ-janus/pom.xml
+++ b/champ-lib/champ-janus/pom.xml
@@ -25,11 +25,12 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.aai</groupId>
+        <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
         <version>1.2.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ.champ-lib</groupId>
     <artifactId>champ-janus</artifactId>
 
     <properties>
@@ -44,15 +45,15 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/champ-lib/champ-titan/pom.xml b/champ-lib/champ-titan/pom.xml
index 35b0ecd..c8abee3 100644
--- a/champ-lib/champ-titan/pom.xml
+++ b/champ-lib/champ-titan/pom.xml
@@ -24,11 +24,12 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
+        <groupId>org.onap.aai.champ</groupId>
         <artifactId>champ-lib</artifactId>
-        <groupId>org.onap.aai</groupId>
         <version>1.2.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ.champ-lib</groupId>
     <artifactId>champ-titan</artifactId>
 
     <properties>
@@ -43,15 +44,15 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml
index c325c9f..1446efb 100644
--- a/champ-lib/pom.xml
+++ b/champ-lib/pom.xml
@@ -28,6 +28,7 @@ limitations under the License.
         <version>1.2.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-lib</artifactId>
     <packaging>pom</packaging>
 
diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml
index 4218051..1c58a18 100644
--- a/champ-service-deps-janus/pom.xml
+++ b/champ-service-deps-janus/pom.xml
@@ -28,14 +28,15 @@ limitations under the License.
         <version>1.2.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-service-deps-janus</artifactId>
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-janus</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml
index 233430f..c80a7a6 100644
--- a/champ-service-deps-titan/pom.xml
+++ b/champ-service-deps-titan/pom.xml
@@ -28,14 +28,15 @@ limitations under the License.
         <version>1.2.1-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-service-deps-titan</artifactId>
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-titan</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>${project.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>
diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 9011bb8..b0920a2 100644
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -24,14 +24,13 @@ limitations under the License.
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
+        <groupId>org.onap.aai</groupId>
+        <artifactId>champ</artifactId>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.aai.champ</groupId>
     <artifactId>champ-service</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
 
     <properties>
         <docker.location>${basedir}/target</docker.location>
@@ -160,9 +159,9 @@ limitations under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.onap.aai</groupId>
+            <groupId>org.onap.aai.champ.champ-lib</groupId>
             <artifactId>champ-core</artifactId>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/pom.xml b/pom.xml
index 07c283a..0f08a93 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,12 @@ limitations under the License.
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <parent>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.1.0</version>
+    </parent>
+
     <groupId>org.onap.aai</groupId>
     <artifactId>champ</artifactId>
     <name>aai-champ</name>