Update POM to inherit from oparent

Removed some redundant and inheritable elements
Fixed warnings related to building effective pom
Removed duplicate dependencies
Add version to maven-deploy-plugin

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

5 files changed, 195 insertions, 563 deletions

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index ccfae3d4..8e107088 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -12,11 +12,7 @@
 	<name>aai-annotations</name>
 	<packaging>jar</packaging>
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -28,111 +24,22 @@
 	</dependencies>
 
 	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- Checkstyle plugin - used to report on compliance with -->
-				<!-- the Google style guide. -->
-
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<version>1.12</version>
-					<configuration>
-						<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-						<licenseName>apache_v2</licenseName>
-						<inceptionYear>2017</inceptionYear>
-						<organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-						<projectName>org.openecomp.aai</projectName>
-						<canUpdateCopyright>true</canUpdateCopyright>
-						<canUpdateDescription>true</canUpdateDescription>
-						<canUpdateLicense>true</canUpdateLicense>
-						<emptyLineAfterHeader>true</emptyLineAfterHeader>
-						<processStartTag>============LICENSE_START=======================================================</processStartTag>
-						<processEndTag>============LICENSE_END=========================================================</processEndTag>
-						<sectionDelimiter>================================================================================</sectionDelimiter>
-						<includes>
-							<include>**/*.java</include>
-							<include>**/*.ksh</include>
-							<include>**/*.sh</include>
-							<include>**/*.ftl</include>
-							<include>**/*.xsd</include>
-							<include>**/*.xjb</include>
-							<include>**/aai*.xml</include>
-							<include>**/*logback*.xml</include>
-							<include>**/*aaiconfig*.properties</include>
-							<include>**/*titan*.properties</include>
-						</includes>
-					</configuration>
-					<executions>
-						<execution>
-							<id>first</id>
-							<goals>
-								<goal>update-file-header</goal>
-							</goals>
-							<phase>process-sources</phase>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<configuration>
-						<source>1.8</source>
-						<target>1.8</target>
-					</configuration>
-				</plugin>
-				<plugin>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>2.4.2</version>
-					<dependencies>
-						<dependency>
-							<groupId>org.apache.maven.scm</groupId>
-							<artifactId>maven-scm-provider-gitexe</artifactId>
-							<version>1.8.1</version>
-						</dependency>
-					</dependencies>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 		<plugins>
-        <plugin>
+    	<plugin>
     		<groupId>org.apache.maven.plugins</groupId>
     		<artifactId>maven-deploy-plugin</artifactId>
-    		<executions>
-        		<execution>
-            		<id>default-deploy</id>
-            		<phase>none</phase>
-        		</execution>
-   			</executions>
-		</plugin>        
-		<plugin>
-		    <groupId>org.sonatype.plugins</groupId>
-		    <artifactId>nexus-staging-maven-plugin</artifactId>
-		    <version>1.6.7</version>
-		    <extensions>true</extensions>
-		    <configuration>
-			<nexusUrl>${nexusproxy}</nexusUrl>
-			<stagingProfileId>176c31dfe190a</stagingProfileId>
-			<serverId>ecomp-staging</serverId>
-		    </configuration>
-		</plugin>
+			</plugin>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</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>
 		<site>
 			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
+			<url>dav:${onap.nexus.url}${sitePath}</url>
 		</site>
 	</distributionManagement>
 
@@ -148,38 +55,5 @@
 			<url>http://www.evosuite.org/m2</url>
 		</pluginRepository>
 	</pluginRepositories>
-	
-	<repositories>
-		<repository>
-			<id>AJSC</id>
-			<name>AJSC repository</name>
-			<url>https://mvnrepository.com/artifact/com.att.ajsc</url>
-		</repository>
-		<repository>
-			<id>restlet</id>
-			<name>maven reslet</name>
-			<url>https://maven.restlet.com/</url>
-		</repository>
-		
-		<repository>
-			<id>central</id>
-			<name>Maven 2 repository 2</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ECOMP Release Repository</name>
-			<url>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>ECOMP Staging Repository</name>
-			<url>${nexusproxy}/content/repositories/staging/</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${nexusproxy}/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
+
 </project>
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index e4e2b22b..cebca913 100644
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -12,7 +12,6 @@
 
         <properties>
           <checkstyle.config.location>google_checks.xml</checkstyle.config.location>
-          <nexusproxy>https://nexus.onap.org</nexusproxy>
           <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
         </properties>
 
@@ -33,135 +32,61 @@
         </dependencies>
 
         <build>
-                <pluginManagement>
-                        <plugins>
-                                <plugin>
-                                        <groupId>org.apache.maven.plugins</groupId>
-                                        <artifactId>maven-compiler-plugin</artifactId>
-                                        <configuration>
-                                                <source>1.8</source>
-                                                <target>1.8</target>
-                                        </configuration>
-                                </plugin>
-                                <plugin>
-                                        <artifactId>maven-release-plugin</artifactId>
-                                        <version>2.4.2</version>
-                                        <dependencies>
-                                                <dependency>
-                                                        <groupId>org.apache.maven.scm</groupId>
-                                                        <artifactId>maven-scm-provider-gitexe</artifactId>
-                                                        <version>1.8.1</version>
-                                                </dependency>
-                                        </dependencies>
-                                </plugin>
-                        </plugins>
-                </pluginManagement>
-                <plugins>
-                  <!-- license plugin -->
-                  <plugin>
-                    <groupId>com.mycila</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <version>3.0</version>
-                    <configuration>
-                      <header>License.txt</header>
-                      <includes>
-                        <include>src/main/java/**</include>
-                      </includes>
-                    </configuration>
-                    <executions>
-                      <execution>
-                        <goals>
-                          <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                      </execution>
-                    </executions>
-                  </plugin>
+          <plugins>
+            <!-- license plugin -->
+            <plugin>
+              <groupId>com.mycila</groupId>
+              <artifactId>license-maven-plugin</artifactId>
+              <version>3.0</version>
+              <configuration>
+                <header>License.txt</header>
+                <includes>
+                  <include>src/main/java/**</include>
+                </includes>
+              </configuration>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>format</goal>
+                  </goals>
+                  <phase>process-sources</phase>
+                </execution>
+              </executions>
+            </plugin>
 
 
-                  <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>
-                  </plugin>
-                  <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.7</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                      <nexusUrl>${nexusproxy}</nexusUrl>
-                      <stagingProfileId>176c31dfe190a</stagingProfileId>
-                      <serverId>ecomp-staging</serverId>
-                    </configuration>
-                </plugin>
-              </plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <version>3.3</version>
+            </plugin>
+            <plugin>
+              <groupId>org.sonatype.plugins</groupId>
+              <artifactId>nexus-staging-maven-plugin</artifactId>
+            </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>
           <site>
             <id>ecomp-site</id>
-            <url>dav:${nexusproxy}${sitePath}</url>
+            <url>dav:${onap.nexus.url}${sitePath}</url>
           </site>
         </distributionManagement>
-
-  <repositories>
-    <repository>
-      <id>AJSC</id>
-      <name>AJSC repository</name>
-      <url>https://mvnrepository.com/artifact/com.att.ajsc</url>
-    </repository>
-    <repository>
-      <id>restlet</id>
-      <name>maven reslet</name>
-      <url>https://maven.restlet.com/</url>
-    </repository>
-    
-    <repository>
-      <id>central</id>
-      <name>Maven 2 repository 2</name>
-      <url>http://repo2.maven.org/maven2/</url>
-    </repository>
-    <repository>
-      <id>ecomp-releases</id>
-      <name>ECOMP Release Repository</name>
-      <url>${nexusproxy}/content/repositories/releases/</url>
-    </repository>
-    <repository>
-      <id>ecomp-staging</id>
-      <name>ECOMP Staging Repository</name>
-      <url>${nexusproxy}/content/repositories/staging/</url>
-    </repository>
-    <repository>
-      <id>ecomp-snapshots</id>
-      <name>ECOMP Snapshot Repository</name>
-      <url>${nexusproxy}/content/repositories/snapshots/</url>
-    </repository>
-  </repositories>
+        <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>
diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 01156bf0..4ccc0f8e 100644
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -12,9 +12,6 @@
 	<name>aai-core</name>
 	<packaging>jar</packaging>
 	<properties>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
 		<sonar.language>java</sonar.language>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -447,24 +444,6 @@
 			<version>2.15.5</version>
 		</dependency>
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-module-javaagent</artifactId>
 			<version>1.6.2</version>
@@ -500,95 +479,40 @@
 				</executions>
 			</plugin>
 			<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>license-maven-plugin</artifactId>
-					<version>1.12</version>
-					<configuration>
-						<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-						<licenseName>apache_v2</licenseName>
-						<inceptionYear>2017</inceptionYear>
-						<organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-						<projectName>org.openecomp.aai</projectName>
-						<canUpdateCopyright>true</canUpdateCopyright>
-						<canUpdateDescription>true</canUpdateDescription>
-						<canUpdateLicense>true</canUpdateLicense>
-						<emptyLineAfterHeader>true</emptyLineAfterHeader>
-						<processStartTag>============LICENSE_START=======================================================</processStartTag>
-						<processEndTag>============LICENSE_END=========================================================</processEndTag>
-						<sectionDelimiter>================================================================================</sectionDelimiter>
-						<includes>
-							<include>**/*.java</include>
-							<include>**/*.ksh</include>
-							<include>**/*.sh</include>
-							<include>**/*.ftl</include>
-							<include>**/*.xsd</include>
-							<include>**/*.xjb</include>
-							<include>**/aai*.xml</include>
-							<include>**/*logback*.xml</include>
-							<include>**/*aaiconfig*.properties</include>
-							<include>**/*titan*.properties</include>
-						</includes>
-					</configuration>
-					<executions>
-						<execution>
-							<id>first</id>
-							<goals>
-								<goal>update-file-header</goal>
-							</goals>
-							<phase>process-sources</phase>
-						</execution>
-					</executions>
-				</plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-site-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.12.4</version>
 				<configuration>
 					<argLine>-noverify ${argLine}</argLine>
-                    <systemPropertyVariables>
+					<systemPropertyVariables>
 						<AJSC_HOME>.</AJSC_HOME>
 						<BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR>
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
-        <plugin>
-    		<groupId>org.apache.maven.plugins</groupId>
-    		<artifactId>maven-deploy-plugin</artifactId>
-    		<executions>
-        		<execution>
-            		<id>default-deploy</id>
-            		<phase>none</phase>
-        		</execution>
-   			</executions>
-		</plugin>
-		<plugin>
-		    <groupId>org.sonatype.plugins</groupId>
-		    <artifactId>nexus-staging-maven-plugin</artifactId>
-		    <version>1.6.7</version>
-		    <extensions>true</extensions>
-		    <configuration>
-			<nexusUrl>${nexusproxy}</nexusUrl>
-			<stagingProfileId>176c31dfe190a</stagingProfileId>
-			<serverId>ecomp-staging</serverId>
-		    </configuration>
-		</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</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>
 		<site>
 			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
+			<url>dav:${onap.nexus.url}${sitePath}</url>
 		</site>
 	</distributionManagement>
 
@@ -605,37 +529,24 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-	<repositories>
-		<repository>
-			<id>AJSC</id>
-			<name>AJSC repository</name>
-			<url>https://mvnrepository.com/artifact/com.att.ajsc</url>
-		</repository>
-		<repository>
-			<id>restlet</id>
-			<name>maven reslet</name>
-			<url>https://maven.restlet.com/</url>
-		</repository>
-
-		<repository>
-			<id>central</id>
-			<name>Maven 2 repository 2</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ECOMP Release Repository</name>
-			<url>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>ECOMP Staging Repository</name>
-			<url>${nexusproxy}/content/repositories/staging/</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${nexusproxy}/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
+	<reporting>
+	  <plugins>
+	    <plugin>
+	      <groupId>org.apache.maven.plugins</groupId>
+	      <artifactId>maven-javadoc-plugin</artifactId>
+	      <version>2.10.4</version>
+	      <configuration>
+	        <failOnError>false</failOnError>
+	        <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+	        <docletArtifact>
+	          <groupId>org.umlgraph</groupId>
+	          <artifactId>umlgraph</artifactId>
+	          <version>5.6</version>
+	        </docletArtifact>
+	        <additionalparam>-views</additionalparam>
+	        <useStandardDocletOptions>true</useStandardDocletOptions>
+	      </configuration>
+	    </plugin>
+	  </plugins>
+	</reporting>
 </project>
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index 4183cf5d..535e43d5 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -11,11 +11,7 @@
 	<artifactId>aai-schema</artifactId>
 	<name>aai-schema</name>
 	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -29,43 +25,7 @@
 			<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>license-maven-plugin</artifactId>
-					<version>1.12</version>
-					<configuration>
-						<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
-						<licenseName>apache_v2</licenseName>
-						<inceptionYear>2017</inceptionYear>
-						<organizationName>AT&amp;T Intellectual Property. All rights reserved.</organizationName>
-						<projectName>org.openecomp.aai</projectName>
-						<canUpdateCopyright>true</canUpdateCopyright>
-						<canUpdateDescription>true</canUpdateDescription>
-						<canUpdateLicense>true</canUpdateLicense>
-						<emptyLineAfterHeader>true</emptyLineAfterHeader>
-						<processStartTag>============LICENSE_START=======================================================</processStartTag>
-						<processEndTag>============LICENSE_END=========================================================</processEndTag>
-						<sectionDelimiter>================================================================================</sectionDelimiter>
-						<includes>
-							<include>**/*.java</include>
-							<include>**/*.ksh</include>
-							<include>**/*.sh</include>
-							<include>**/*.ftl</include>
-							<include>**/*.xsd</include>
-							<include>**/*.xjb</include>
-							<include>**/aai*.xml</include>
-							<include>**/*logback*.xml</include>
-							<include>**/*aaiconfig*.properties</include>
-							<include>**/*titan*.properties</include>
-						</includes>
-					</configuration>
-					<executions>
-						<execution>
-							<id>first</id>
-							<goals>
-								<goal>update-file-header</goal>
-							</goals>
-							<phase>process-sources</phase>
-						</execution>
-					</executions>
-				</plugin>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jaxb2-maven-plugin</artifactId>
@@ -113,53 +73,22 @@
 			<plugin>
 			  <groupId>org.apache.maven.plugins</groupId>
 			  <artifactId>maven-site-plugin</artifactId>
-			  <version>3.6</version>
-			  <dependencies>
-			    <dependency>
-			      <groupId>org.apache.maven.wagon</groupId>
-			      <artifactId>wagon-webdav-jackrabbit</artifactId>
-			      <version>2.10</version>
-			    </dependency>
-			  </dependencies>
 			</plugin>
-        <plugin>
+			<plugin>
     		<groupId>org.apache.maven.plugins</groupId>
     		<artifactId>maven-deploy-plugin</artifactId>
-    		<executions>
-        		<execution>
-            		<id>default-deploy</id>
-            		<phase>none</phase>
-        		</execution>
-   			</executions>
-		</plugin>        
-		<plugin>
+			</plugin>
+			<plugin>
 		    <groupId>org.sonatype.plugins</groupId>
 		    <artifactId>nexus-staging-maven-plugin</artifactId>
-		    <version>1.6.7</version>
-		    <extensions>true</extensions>
-		    <configuration>
-			<nexusUrl>${nexusproxy}</nexusUrl>
-			<stagingProfileId>176c31dfe190a</stagingProfileId>
-			<serverId>ecomp-staging</serverId>
-		    </configuration>
-		</plugin>
+			</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>
 		<site>
 			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
+			<url>dav:${onap.nexus.url}${sitePath}</url>
 		</site>
 	</distributionManagement>
 	
@@ -176,38 +105,4 @@
 		</pluginRepository>
 	</pluginRepositories>
 	
-	<repositories>
-		<repository>
-			<id>AJSC</id>
-			<name>AJSC repository</name>
-			<url>https://mvnrepository.com/artifact/com.att.ajsc</url>
-		</repository>
-		<repository>
-			<id>restlet</id>
-			<name>maven reslet</name>
-			<url>https://maven.restlet.com/</url>
-		</repository>
-		
-		<repository>
-			<id>central</id>
-			<name>Maven 2 repository 2</name>
-			<url>http://repo2.maven.org/maven2/</url>
-		</repository>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>ECOMP Release Repository</name>
-			<url>${nexusproxy}/content/repositories/releases/</url>
-		</repository>
-		<repository>
-			<id>ecomp-staging</id>
-			<name>ECOMP Staging Repository</name>
-			<url>${nexusproxy}/content/repositories/staging/</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>ECOMP Snapshot Repository</name>
-			<url>${nexusproxy}/content/repositories/snapshots/</url>
-		</repository>
-	</repositories>
-	
 </project>
diff --git a/pom.xml b/pom.xml
index 5eedf9b0..5ac0b306 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,17 @@
 <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.onap.aai.aai-common</groupId>
   <artifactId>aai-common</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>aai-common</name>
-  
+
   <modules>
   	<module>aai-schema</module>
   	<module>aai-annotations</module>
@@ -14,28 +20,24 @@
   </modules>
 
 	<properties>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath>
 		<aai.annotations.version>1.1.0-SNAPSHOT</aai.annotations.version>
 		<aai.schema.version>1.1.0-SNAPSHOT</aai.schema.version>
 		<aai.core.version>1.1.0-SNAPSHOT</aai.core.version>
 	</properties>
 
-  <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    </configuration>
-                </plugin>
-                <plugin>
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<configuration>
+						<source>1.8</source>
+						<target>1.8</target>
+					</configuration>
+				</plugin>
+				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>license-maven-plugin</artifactId>
 					<version>1.12</version>
@@ -70,7 +72,7 @@
 					</configuration>
 					<executions>
 						<execution>
-							<id>first</id> 
+							<id>first</id>
 							<goals>
 								<goal>update-file-header</goal>
 							</goals>
@@ -78,59 +80,50 @@
 						</execution>
 					</executions>
 				</plugin>
-        <plugin>
-    		<groupId>org.apache.maven.plugins</groupId>
-    		<artifactId>maven-deploy-plugin</artifactId>
-    		<executions>
-        		<execution>
-            		<id>default-deploy</id>
-            		<phase>none</phase>
-        		</execution>
-   			</executions>
-		</plugin>        
-		<plugin>
-		    <groupId>org.sonatype.plugins</groupId>
-		    <artifactId>nexus-staging-maven-plugin</artifactId>
-		    <version>1.6.7</version>
-		    <extensions>true</extensions>
-		    <configuration>
-			<nexusUrl>${nexusproxy}</nexusUrl>
-			<stagingProfileId>176c31dfe190a</stagingProfileId>
-			<serverId>ecomp-staging</serverId>
-		    </configuration>
-		</plugin>
-            </plugins>
-        </pluginManagement>
-	<plugins>
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-site-plugin</artifactId>
-			<version>3.6</version>
-			<dependencies>
-				<dependency>
-					<groupId>org.apache.maven.wagon</groupId>
-					<artifactId>wagon-webdav-jackrabbit</artifactId>
-					<version>2.10</version>
-				</dependency>
-			</dependencies>
-		</plugin>
-	</plugins>
-    </build>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>2.8.2</version>
+					<executions>
+						<execution>
+							<id>default-deploy</id>
+							<phase>none</phase>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.sonatype.plugins</groupId>
+					<artifactId>nexus-staging-maven-plugin</artifactId>
+					<version>1.6.7</version>
+					<extensions>true</extensions>
+					<configuration>
+						<nexusUrl>${onap.nexus.url}</nexusUrl>
+						<stagingProfileId>176c31dfe190a</stagingProfileId>
+						<serverId>ecomp-staging</serverId>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<version>3.6</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.wagon</groupId>
+						<artifactId>wagon-webdav-jackrabbit</artifactId>
+						<version>2.10</version>
+					</dependency>
+				</dependencies>
+			</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>
 		<site>
 			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}${sitePath}</url>
+			<url>dav:${onap.nexus.url}${sitePath}</url>
 		</site>
 	</distributionManagement>
 	<reporting>
@@ -148,10 +141,44 @@
 	          <version>5.6</version>
 	        </docletArtifact>
 	        <additionalparam>-views -Xdoclint:none </additionalparam>
-			  <excludePackageNames>org.openecomp.aai.domain.yang.*:org.openecomp.aai.util.*</excludePackageNames>
+			<excludePackageNames>org.openecomp.aai.domain.yang.*:org.openecomp.aai.util.*</excludePackageNames>
 	        <useStandardDocletOptions>true</useStandardDocletOptions>
 	      </configuration>
 	    </plugin>
 	  </plugins>
 	</reporting>
+
+	<repositories>
+		<repository>
+			<id>AJSC</id>
+			<name>AJSC repository</name>
+			<url>https://mvnrepository.com/artifact/com.att.ajsc</url>
+		</repository>
+		<repository>
+			<id>restlet</id>
+			<name>maven reslet</name>
+			<url>https://maven.restlet.com/</url>
+		</repository>
+
+		<repository>
+			<id>central</id>
+			<name>Maven 2 repository 2</name>
+			<url>http://repo2.maven.org/maven2/</url>
+		</repository>
+		<repository>
+			<id>ecomp-releases</id>
+			<name>ECOMP Release Repository</name>
+			<url>${onap.nexus.url}/content/repositories/releases/</url>
+		</repository>
+		<repository>
+			<id>ecomp-staging</id>
+			<name>ECOMP Staging Repository</name>
+			<url>${onap.nexus.url}/content/repositories/staging/</url>
+		</repository>
+		<repository>
+			<id>ecomp-snapshots</id>
+			<name>ECOMP Snapshot Repository</name>
+			<url>${onap.nexus.url}/content/repositories/snapshots/</url>
+		</repository>
+	</repositories>
 </project>