From e3948b0308c817f0b43918731ee26dab6202c0c9 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Mon, 4 Mar 2019 11:49:26 -0500
Subject: Change nexus-staging config

nexus-staging-maven-plugin interferes with Jenkins staging job, but
is needed for release-version and docker-version jobs.  Changed to
install nexus-staging-maven-plugin in a separate build profile that
is activated when altDeploymentRepository property is unset. This property
is set by the staging Jenkins job only.

Change-Id: I877e176229efd6bd5c08a6b83a2594cc4e57eebe
Issue-ID: CCSDK-1119
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 odlparent/mdsal-it-parent/pom.xml | 40 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'odlparent/mdsal-it-parent/pom.xml')

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 8d52a23f..403058ba 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -440,7 +440,29 @@
 		</profile>
 
 		<!-- End of profiles from ONAP oparent -->
-
+		<profile>
+			<id>nexus-staging</id>
+			<activation>
+			    <property>
+			        <name>!altDeploymentRepository</name>
+			    </property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.7</version>
+						<extensions>true</extensions>
+						<configuration>
+							<nexusUrl>https://nexus.onap.org</nexusUrl>
+							<stagingProfileId></stagingProfileId>
+							<serverId>ecomp-releases</serverId>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<activation>
 				<file>
@@ -747,17 +769,7 @@
 			<plugins>
 
 				<!-- Plugins from ONAP version (parent of oparent) -->
-				<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>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
@@ -983,10 +995,6 @@
 		<plugins>
 
 			<!-- Plugins from oparent version (parent of oparent) -->
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-deploy-plugin</artifactId>
-- 
cgit 1.2.3-korg