From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Sat, 19 Aug 2017 02:43:34 +0000 (-0700)
Subject: Update POM to inherit from oparent
X-Git-Tag: v1.1.0~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Frouter-core.git;a=commitdiff_plain;h=3c54d6792dcf434086554e97d475cce73b2397ac

Update POM to inherit from oparent

Change-Id: Id598bdd1863c798fd22a53dc8daa35c3020f026b
Issue-Id: AAI-77
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
---

diff --git a/pom.xml b/pom.xml
index 7f64a8e..a671915 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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.onap.oparent</groupId>
+      <artifactId>oparent</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+   </parent>
+
    <groupId>org.onap.aai.router-core</groupId>
    <artifactId>router-core</artifactId>
    <packaging>bundle</packaging>
    <version>1.1.0-SNAPSHOT</version>
    <name>Core Data Router Components</name>
    <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
       <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-      <nexusproxy>https://nexus.onap.org</nexusproxy>
       <!-- Sonar Properties -->
       <sonar.language>java</sonar.language>
       <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -122,23 +125,7 @@
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-site-plugin</artifactId>
-            <version>3.3</version>
-            <configuration>
-               <reportPlugins>
-                  <plugin>
-                     <groupId>org.apache.maven.plugins</groupId>
-                     <artifactId>maven-checkstyle-plugin</artifactId>
-                     <version>2.17</version>
-                     <reportSets>
-                        <reportSet>
-                           <reports>
-                              <report>checkstyle</report>
-                           </reports>
-                        </reportSet>
-                     </reportSets>
-                  </plugin>
-               </reportPlugins>
-            </configuration>
+            <version>3.6</version>
          </plugin>
          <plugin>
             <groupId>org.sonatype.plugins</groupId>
@@ -146,7 +133,7 @@
             <version>1.6.7</version>
             <extensions>true</extensions>
             <configuration>
-               <nexusUrl>${nexusproxy}</nexusUrl>
+               <nexusUrl>${onap.nexus.url}</nexusUrl>
                <stagingProfileId>176c31dfe190a</stagingProfileId>
                <serverId>ecomp-staging</serverId>
             </configuration>
@@ -178,16 +165,22 @@
          </plugin>
       </plugins>
    </build>
-   <distributionManagement>
-      <repository>
-         <id>ecomp-releases</id>
-         <name>ECOMP Release Repository</name>
-         <url>${nexusproxy}/content/repositories/releases/</url>
-      </repository>
-      <snapshotRepository>
-         <id>ecomp-snapshots</id>
-         <name>ECOMP Snapshot Repository</name>
-         <url>${nexusproxy}/content/repositories/snapshots/</url>
-      </snapshotRepository>
-   </distributionManagement>
+
+   <reporting>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>2.17</version>
+            <reportSets>
+               <reportSet>
+                  <reports>
+                     <report>checkstyle</report>
+                  </reports>
+               </reportSet>
+            </reportSets>
+         </plugin>
+      </plugins>
+   </reporting>
+
 </project>