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>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 010f25f..4c804b4 100644 (file)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-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>

diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 411bf56..915a9a5 100644 (file)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-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>

diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index f1ff917..0e913d1 100644 (file)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-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>

diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index 8d52a23..403058b 100644 (file)
--- 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>

diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 696a409..45b663a 100644 (file)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/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>

diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index a1159cb..a86c2fb 100644 (file)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/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>

diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 5829112..d9b3433 100755 (executable)
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.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://${onap.nexus.host}</nexusUrl>
+                                                       <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+                                                       <serverId>${onap.nexus.staging.server-id}</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>

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index ae3329b..1c50cd2 100644 (file)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-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>

diff --git a/pom.xml b/pom.xml
index 3dffd11..05678e6 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,58 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-    <groupId>org.onap.ccsdk.parent</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
-    <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
+       <modelVersion>4.0.0</modelVersion>
+       <packaging>pom</packaging>
+       <groupId>org.onap.ccsdk.parent</groupId>
+       <artifactId>parent</artifactId>
+       <version>1.2.1-SNAPSHOT</version>
+       <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
 
-    <properties>
-        <onap.nexus.host>nexus.onap.org</onap.nexus.host>
-        <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
-        <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
-    </properties>
+       <properties>
+               <onap.nexus.host>nexus.onap.org</onap.nexus.host>
+               <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id>
+               <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id>
+       </properties>
 
-    <distributionManagement>
-        <repository>
-            <id>ecomp-releases</id>
-            <url>https://nexus.onap.org/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>ecomp-snapshots</id>
-            <url>https://nexus.onap.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
+       <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <url>https://nexus.onap.org/content/repositories/releases</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <url>https://nexus.onap.org/content/repositories/snapshots</url>
+               </snapshotRepository>
+       </distributionManagement>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <processAllModules>true</processAllModules>
-                </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>
-    <modules>
-       <module>odlparent</module>
-       <module>springboot</module>
-    </modules>
+       <profiles>
+               <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>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>versions-maven-plugin</artifactId>
+                               <version>2.5</version>
+                               <configuration>
+                                       <processAllModules>true</processAllModules>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <modules>
+               <module>odlparent</module>
+               <module>springboot</module>
+       </modules>
 
 </project>

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 37d4d0a..3d5cf6f 100755 (executable)
--- 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 b3e1c32..a6d64be 100755 (executable)
--- 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>