Fix staging build

Fix staging build for casablanca.  This needs to be done to create
release version for 3.0.2 mtce release.

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

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 55ec281..4fce046 100755 (executable)
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>binding-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.opendaylight.mdsal</groupId>
@@ -415,6 +415,29 @@
 
                <!-- 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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <activation>
                                <file>
@@ -1226,17 +1249,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/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 7367d40..6ddb727 100755 (executable)
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>bundle-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
@@ -413,6 +413,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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
 
        </profiles>
 
@@ -1123,17 +1146,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/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index ce260bb..3943be2 100644 (file)
--- a/odlparent/client-parent/pom.xml
+++ b/odlparent/client-parent/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>client-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
        <url>http://wiki.onap.org</url>
@@ -341,6 +341,32 @@
                        <url>https://nexus.onap.org/content/repositories/snapshots</url>
                </snapshotRepository>
        </distributionManagement>
+       
+       <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://nexus.onap.org</nexusUrl>
+                                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>      
+       </profiles>
 
        <build>
                <pluginManagement>
@@ -517,17 +543,6 @@
 
                </pluginManagement>
                <plugins>
-                       <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/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index b35c664..ce8c3fc 100755 (executable)
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>feature-repo-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
@@ -413,7 +413,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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 
 
@@ -1123,17 +1145,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/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index b7a2654..a80d1ef 100755 (executable)
--- a/odlparent/karaf4-parent/pom.xml
+++ b/odlparent/karaf4-parent/pom.xml
@@ -411,7 +411,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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 
 
@@ -1121,17 +1143,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/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index cec6697..709f568 100755 (executable)
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>mdsal-it-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.opendaylight.controller</groupId>
@@ -413,6 +413,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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
 
        </profiles>
 
@@ -1124,17 +1147,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/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 6beb12c..9691be2 100755 (executable)
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>odlparent-lite</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
@@ -419,6 +419,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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
 
        </profiles>
 
@@ -1156,17 +1179,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/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index e2f66b3..7f41827 100755 (executable)
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>odlparent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
@@ -413,7 +413,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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 
 
@@ -1123,17 +1145,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/odlparent/pom.xml b/odlparent/pom.xml
index 2c2349a..ba378b8 100755 (executable)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -7,12 +7,12 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>odlparent-aggregator</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>parent</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
     </parent>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index ac4bf39..651f809 100755 (executable)
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>single-feature-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.opendaylight.odlparent</groupId>
@@ -416,7 +416,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>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 
 
@@ -1158,17 +1180,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/pom.xml b/pom.xml
index a127ed3..2701d77 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <packaging>pom</packaging>
     <groupId>org.onap.ccsdk.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.1.4-SNAPSHOT</version>
     <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>
 
     <properties>
@@ -27,6 +27,31 @@
         </snapshotRepository>
     </distributionManagement>
 
+    <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://nexus.onap.org</nexusUrl>
+                                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+    </profiles>
     <build>
         <plugins>
             <plugin>
@@ -37,17 +62,7 @@
                     <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>

diff --git a/springboot/pom.xml b/springboot/pom.xml
index 8a3f0d8..a876c20 100755 (executable)
--- a/springboot/pom.xml
+++ b/springboot/pom.xml
@@ -7,12 +7,12 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>springboot-aggregator</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>parent</artifactId>
-        <version>1.1.3-SNAPSHOT</version>
+        <version>1.1.4-SNAPSHOT</version>
     </parent>
 
        <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name>

diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 62d2816..61b81e4 100755 (executable)
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>spring-boot-1-starter-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.springframework.boot</groupId>
@@ -327,7 +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://nexus.onap.org</nexusUrl>
+                                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 
 
@@ -946,17 +968,7 @@
                                        </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 5790b00..2cff612 100755 (executable)
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -6,7 +6,7 @@
        <packaging>pom</packaging>
        <groupId>org.onap.ccsdk.parent</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-       <version>1.1.3-SNAPSHOT</version>
+       <version>1.1.4-SNAPSHOT</version>
 
        <parent>
                <groupId>org.springframework.boot</groupId>
@@ -327,7 +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://nexus.onap.org</nexusUrl>
+                                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                                       <serverId>ecomp-staging</serverId>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
        </profiles>
 
 
@@ -946,17 +968,7 @@
                                        </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/version.properties b/version.properties
index 21262d3..d8f1b7f 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
 
 release_name=1
 sprint_number=1
-feature_revision=3
+feature_revision=4
 
 base_version=${release_name}.${sprint_number}.${feature_revision}