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>
---
 springboot/springboot1/pom.xml | 35 ++++++++++++++++++++++++-----------
 springboot/springboot2/pom.xml | 34 +++++++++++++++++++++++-----------
 2 files changed, 47 insertions(+), 22 deletions(-)

(limited to 'springboot')

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 37d4d0a9..3d5cf6f5 100755
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -332,6 +332,30 @@
 		</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://${onap.nexus.host}</nexusUrl>
+							<stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+							<serverId>${onap.nexus.staging.server-id}</serverId>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 
 	</profiles>
 
@@ -951,17 +975,6 @@
 					</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>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index b3e1c32d..a6d64bec 100755
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -327,6 +327,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://${onap.nexus.host}</nexusUrl>
+							<stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+							<serverId>${onap.nexus.staging.server-id}</serverId>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 
 	</profiles>
 
@@ -946,17 +969,6 @@
 					</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>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-- 
cgit 1.2.3-korg