From a3d8bdeda0ea73adfd75c4c1404f885a171ae374 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 13 Sep 2017 13:53:45 -0400
Subject: [PATCH] Use oparent as parent

Update odlparent-carbon-sr1 POM to use oparent-odlparent as parent,
so that oparent settings are inherited.  Also, enabled staging
plugin.

Change-Id: Ic7dd1cb5c86fd2dc9ba71b700caa74efe1655e16
Issue-ID: CCSDK-43
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 odlparent-boron-sr3/pom.xml  |  4 ++--
 odlparent-carbon-sr1/pom.xml | 10 +++++-----
 pom.xml                      |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/odlparent-boron-sr3/pom.xml b/odlparent-boron-sr3/pom.xml
index 957e302a..87b237ae 100755
--- a/odlparent-boron-sr3/pom.xml
+++ b/odlparent-boron-sr3/pom.xml
@@ -13,7 +13,7 @@
     <packaging>pom</packaging>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-boron-sr3</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
 
 
 
@@ -25,7 +25,7 @@
         <onap.nexus.public-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/groups/public</onap.nexus.public-url>
         <onap.nexus.release-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/releases</onap.nexus.release-url>
         <onap.nexus.snapshot-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/snapshots</onap.nexus.snapshot-url>
-        <onap.nexus.staging.server-id>ecomp-releases</onap.nexus.staging.server-id>
+        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
 
diff --git a/odlparent-carbon-sr1/pom.xml b/odlparent-carbon-sr1/pom.xml
index bfd505e2..aecf5c28 100755
--- a/odlparent-carbon-sr1/pom.xml
+++ b/odlparent-carbon-sr1/pom.xml
@@ -3,9 +3,9 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.8.1-Carbon</version>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent-odlparent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
 	<relativePath />
   </parent>
 
@@ -13,7 +13,7 @@
     <packaging>pom</packaging>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>odlparent-carbon-sr1</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
 
 
 
@@ -25,7 +25,7 @@
         <onap.nexus.public-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/groups/public</onap.nexus.public-url>
         <onap.nexus.release-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/releases</onap.nexus.release-url>
         <onap.nexus.snapshot-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/snapshots</onap.nexus.snapshot-url>
-        <onap.nexus.staging.server-id>ecomp-releases</onap.nexus.staging.server-id>
+        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
 
diff --git a/pom.xml b/pom.xml
index a029ba7e..d242f44d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <packaging>pom</packaging>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
 
     <name>ccsdk-parent</name>
     <url>http://wiki.onap.org</url>
@@ -20,7 +20,7 @@
         <onap.nexus.public-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/groups/public</onap.nexus.public-url>
         <onap.nexus.release-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/releases</onap.nexus.release-url>
         <onap.nexus.snapshot-url>${onap.nexus.protocol}://${onap.nexus.host}:${onap.nexus.port}/content/repositories/snapshots</onap.nexus.snapshot-url>
-        <onap.nexus.staging.server-id>ecomp-releases</onap.nexus.staging.server-id>
+        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
         <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
 
     </properties>
@@ -233,7 +233,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <skipStaging>true</skipStaging>
+                    <skipStaging>false</skipStaging>
                 </configuration>
             </plugin>
         </plugins>
-- 
2.16.6