From 6e33c5d1bc3c7dfab8f3c515c1cf67e3775aec55 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Mon, 28 Aug 2017 17:10:25 -0400
Subject: Restore staging repository and plugin.

Use names releases, staging, snapshots, public (no onap- prefix).

Issue: PORTAL-89
Change-Id: Ie309f1aaa3120de1fa1e82d572174e2c70bb6641
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 ecomp-sdk/epsdk-analytics/pom.xml | 46 ---------------------------------------
 ecomp-sdk/epsdk-core/pom.xml      | 15 -------------
 ecomp-sdk/pom.xml                 | 32 ++++++++++++++++++++-------
 3 files changed, 24 insertions(+), 69 deletions(-)

diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml
index 6f6ec01b..65edad16 100644
--- a/ecomp-sdk/epsdk-analytics/pom.xml
+++ b/ecomp-sdk/epsdk-analytics/pom.xml
@@ -17,52 +17,6 @@
 	<url>https://wiki.onap.org/display/DW/Portal</url>
 
 	<!-- repositories are inherited from parent -->
-	
-	<build>
-	<plugins>
-	<!--  
-	<plugin>
-			    <groupId>org.codehaus.mojo</groupId>
-			    <artifactId>license-maven-plugin</artifactId>
-			    <version>1.10</version>
-			    <configuration>
-		              <encoding>UTF-8</encoding>
-			        <licenseName>my_license</licenseName>
-			        <licenseResolver>${project.baseUri}/license</licenseResolver>
-			        <inceptionYear>2017</inceptionYear>
-				<organizationName>AT&amp;T Intellectual Property</organizationName>
-				<projectName>eCOMP Portal SDK</projectName> 
-				<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> 
-     				<processStartTag>================================================================================</processStartTag>
-     				<sectionDelimiter>================================================================================</sectionDelimiter>
-     				<processEndTag>================================================================================</processEndTag> 
-			    	<roots>
-					<root>src/main</root>
-				</roots>
-				<excludes>
-					<exclude>*.png</exclude>
-					<exclude>*.drl</exclude>
-					<exclude>*.gif</exclude>
-					<exclude>*.jpeg</exclude>
-					<exclude>*.jpg</exclude>
-					<exclude>*.bmp</exclude>
-					<exclude>*.ico</exclude>
-					<exclude>*.svg</exclude>
-				</excludes>
-			    </configuration>
-			    <executions>
-			        <execution>
-			            <id>first</id>
-			            <goals>
-			                <goal>update-file-header</goal>
-			            </goals>
-			            <phase>process-sources</phase>
-			        </execution>
-			    </executions>
-			</plugin>
-			-->
-	</plugins>
-	</build>
 
 	<dependencies>
 	
diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index 1534decb..a2af092b 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -385,21 +385,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-<!-- 		<dependency>
-			<groupId>com.att.nsa</groupId>
-			<artifactId>highlandParkCore</artifactId>
-			<version>0.3.2</version>
-			<exclusions>
-				<exclusion>
-					<groupId>log4j</groupId>
-					<artifactId>log4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-log4j12</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency> -->
 		
 	</dependencies>
 	
diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml
index 16ae79b4..7f0b583e 100644
--- a/ecomp-sdk/pom.xml
+++ b/ecomp-sdk/pom.xml
@@ -27,25 +27,29 @@
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
+		<stagingNexusPath>content/repositories/staging/</stagingNexusPath>
 		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
 	</properties>
 
 	<repositories>
 		<repository>
-			<!-- Releases repository has ECOMP release artifacts -->
-			<id>ecomp-releases</id>
-			<name>OpenECOMP - Release Repository</name>
+			<id>releases</id>
+			<name>ONAP - Release Repository</name>
 			<url>${nexusproxy}/${releaseNexusPath}</url>
 		</repository>
 		<repository>
-			<!-- Snapshots repository has ECOMP snapshot artifacts -->
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP - Snapshot Repository</name>
+			<id>staging</id>
+			<name>ONAP - Staging Repository</name>
+			<url>${nexusproxy}/${stagingNexusPath}</url>
+		</repository>
+		<repository>
+			<id>snapshots</id>
+			<name>ONAP - Snapshot Repository</name>
 			<url>${nexusproxy}/${snapshotNexusPath}</url>
 		</repository>
 		<repository>
-			<id>ecomp-public</id>
-			<name>ecomp onap public Repository</name>
+			<id>public</id>
+			<name>ONAP public Repository</name>
 			<url>https://nexus.onap.org/content/groups/public</url>
 		</repository>
 	</repositories>
@@ -130,6 +134,18 @@
 				</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>staging</serverId>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-- 
cgit 1.2.3-korg