From: Timoney, Dan (dt5972) <dtimoney@att.com>
Date: Thu, 18 Apr 2019 20:01:09 +0000 (-0400)
Subject: Remove duplicate staging
X-Git-Tag: 1.4.5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Ftags%2F1.4.5;p=sdnc%2Foam.git

Remove duplicate staging

Surround staging config in build profile so that staging plugin is
not run for topmost pom.xml

Change-Id: I71863a7efc68efffc16ea12d70bce27df6f9bcf7
Issue-ID: CCSDK-1166
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

Former-commit-id: 7566807e10aaf852ea75293a3782407fe9ddb7bb
---

diff --git a/pom.xml b/pom.xml
index a900c758..6063d15a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -58,17 +58,6 @@
 					<skipTests>false</skipTests>
 				</configuration>
 			</plugin>
-			<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>
 
@@ -113,6 +102,29 @@
 			<module>installation</module>
 		  </modules>
 	        </profile>
+		<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>176c31dfe190a</stagingProfileId>
+							<serverId>ecomp-staging</serverId>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 
 	</profiles>
 </project>