From f657391dcf4fe576fef9a464a9ef549b91ff1013 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Wed, 21 Jun 2017 16:51:59 -0700
Subject: Refactor POM to inherit from oparent

Refactor POM to inherit from oparent.
Remove local settings related to nexus and checkstyle.

Issue-id: APPC-78
Change-Id: I52167488d5d9216f351f306348ca77544cac9def
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 pom.xml | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4085621e7..d6df08d31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,10 +2,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">
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.7.1-Boron-SR1</version>
-        <relativePath>../../../../../opendaylight/odlparent</relativePath>
+        <groupId>org.onap.oparent</groupId>
+        <artifactId>oparent</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
 
@@ -85,14 +84,7 @@
         <features.file>features.xml</features.file>
         <jmxGeneratorPath>target/generated-sources/yang-gen-config</jmxGeneratorPath>
         <!-- <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath> -->
-        <checkstyle.skip>true</checkstyle.skip>
 
-        <!-- NEXUS URLS -->
-        <openecomp.nexus.host>nexus.onap.org</openecomp.nexus.host>
-        <openecomp.nexus.url>https://${openecomp.nexus.host}/content</openecomp.nexus.url>
-        <openecomp.nexus.snapshot-url>${openecomp.nexus.url}/repositories/snapshots/</openecomp.nexus.snapshot-url>
-        <openecomp.nexus.release-url>${openecomp.nexus.url}/repositories/releases/</openecomp.nexus.release-url>
-        <openecomp.nexus.javadocs-url>dav:${openecomp.nexus.url}/sites/site/org/onap/appc/${project.version}</openecomp.nexus.javadocs-url>
     </properties>
 
 
@@ -129,18 +121,8 @@
         <!-- This site is used for Javadocs -->
         <site>
             <id>ecomp-site</id>
-            <url>${openecomp.nexus.javadocs-url}</url>
+            <url>dav:${onap.nexus.url}/sites/site/org/onap/appc/${project.version}</url>
         </site>
-        <repository>
-            <id>ecomp-releases</id>
-            <name>openecomp-repository-releases</name>
-            <url>${openecomp.nexus.release-url}</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <name>openecomp-repository-snapshots</name>
-            <url>${openecomp.nexus.snapshot-url}</url>
-        </snapshotRepository>
     </distributionManagement>
 
 
@@ -191,6 +173,13 @@
     <dependencyManagement>
         <dependencies>
             <!-- ODL -->
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odlparent</artifactId>
+                <version>1.7.1-Boron-SR1</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>config-api</artifactId>
@@ -515,7 +504,7 @@
                 <version>1.6.7</version>
                 <extensions>true</extensions>
                 <configuration>
-                    <nexusUrl>https://${openecomp.nexus.host}</nexusUrl>
+                    <nexusUrl>${onap.nexus.url}</nexusUrl>
                     <stagingProfileId>176c31dfe190a</stagingProfileId>
                     <serverId>ecomp-staging</serverId>
                 </configuration>
@@ -630,9 +619,6 @@
             <properties>
                 <ssl.allowall>true</ssl.allowall>
                 <ssl.insecure>true</ssl.insecure>
-                <openecomp.nexus.host>nexus.onap.org</openecomp.nexus.host>
-                <openecomp.nexus.release-url>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.release-url>
-                <openecomp.nexus.snapshot-url>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshot-url>
                 <openecomp.git.port>7999</openecomp.git.port>
                 <openecomp.git.project>st_osecomp</openecomp.git.project>
                 <openecomp.git.protocol>http</openecomp.git.protocol>
-- 
cgit 1.2.3-korg