From dc5186ed8d5a9a280a36afb40b6b7f457a8c82f2 Mon Sep 17 00:00:00 2001
From: Dileep Ranganathan <dileep.ranganathan@intel.com>
Date: Fri, 18 Aug 2017 11:58:52 -0700
Subject: 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>
---
 aai-annotations/pom.xml | 142 +++---------------------------------------------
 1 file changed, 8 insertions(+), 134 deletions(-)

(limited to 'aai-annotations/pom.xml')

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>
-- 
cgit 1.2.3-korg