summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-04-17 15:26:38 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-04-17 15:26:41 -0400
commitdc63c6821144ac87c94d2e2a63863537f460924f (patch)
treed7c5c7122eb51c4c7389bd1979f35cc233317044
parente1d7eb376cf7edab7cee1043b7fae23280155fe4 (diff)
Fix staging build1.1.4casablanca
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>
-rwxr-xr-xodlparent/binding-parent/pom.xml36
-rwxr-xr-xodlparent/bundle-parent/pom.xml36
-rw-r--r--odlparent/client-parent/pom.xml39
-rwxr-xr-xodlparent/feature-repo-parent/pom.xml37
-rwxr-xr-xodlparent/karaf4-parent/pom.xml35
-rwxr-xr-xodlparent/mdsal-it-parent/pom.xml36
-rwxr-xr-xodlparent/odlparent-lite/pom.xml36
-rwxr-xr-xodlparent/odlparent/pom.xml37
-rwxr-xr-xodlparent/pom.xml4
-rwxr-xr-xodlparent/single-feature-parent/pom.xml37
-rwxr-xr-xpom.xml39
-rwxr-xr-xspringboot/pom.xml4
-rwxr-xr-xspringboot/springboot1/pom.xml38
-rwxr-xr-xspringboot/springboot2/pom.xml38
-rw-r--r--version.properties2
15 files changed, 300 insertions, 154 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 55ec2818..4fce0469 100755
--- 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>
@@ -416,6 +416,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>
<exists>src/main/yang</exists>
@@ -1227,17 +1250,6 @@
</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>
<version>2.5</version>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index 7367d400..6ddb727a 100755
--- 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>
@@ -1124,17 +1147,6 @@
</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>
<version>2.5</version>
diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml
index ce260bb0..3943be2e 100644
--- 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>
@@ -518,17 +544,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>
<version>2.5</version>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index b35c664d..ce8c3fc8 100755
--- 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>
@@ -1124,17 +1146,6 @@
</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>
<version>2.5</version>
diff --git a/odlparent/karaf4-parent/pom.xml b/odlparent/karaf4-parent/pom.xml
index b7a26547..a80d1eff 100755
--- 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>
@@ -1122,17 +1144,6 @@
</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>
<version>2.5</version>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index cec66973..709f5682 100755
--- 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>
@@ -1125,17 +1148,6 @@
</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>
<version>2.5</version>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index 6beb12c7..9691be29 100755
--- 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>
@@ -1157,17 +1180,6 @@
</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>
<version>2.5</version>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index e2f66b3f..7f418273 100755
--- 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>
@@ -1124,17 +1146,6 @@
</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>
<version>2.5</version>
diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 2c2349a3..ba378b89 100755
--- 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 ac4bf399..651f8092 100755
--- 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>
@@ -1159,17 +1181,6 @@
</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>
<version>2.5</version>
diff --git a/pom.xml b/pom.xml
index a127ed32..2701d778 100755
--- 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 8a3f0d87..a876c20b 100755
--- 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 62d28169..61b81e4b 100755
--- 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 5790b008..2cff612c 100755
--- 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 21262d34..d8f1b7ff 100644
--- 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}