Update POM to inherit from oparent

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

diff --git a/pom.xml b/pom.xml
index 45a5f3e..5c208c9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,12 @@
 <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/xsd/maven-4.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.openecomp.aai</groupId>
        <artifactId>rest-client</artifactId>
        <version>1.1.0-SNAPSHOT</version>
@@ -9,7 +14,6 @@
         
        <properties>
               <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>
@@ -97,23 +101,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>
                        </plugins>
                </pluginManagement>
@@ -145,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>
@@ -179,17 +167,21 @@
                </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>