From: Timoney, Dan (dt5972) Date: Wed, 17 Apr 2019 19:26:38 +0000 (-0400) Subject: Fix staging build X-Git-Tag: 1.1.4^0 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fcasablanca;p=ccsdk%2Fparent.git 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) --- 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 @@ pom org.onap.ccsdk.parent binding-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.opendaylight.mdsal @@ -415,6 +415,29 @@ + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1226,17 +1249,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent bundle-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.opendaylight.odlparent @@ -413,6 +413,29 @@ + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1123,17 +1146,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent client-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} http://wiki.onap.org @@ -341,6 +341,32 @@ https://nexus.onap.org/content/repositories/snapshots + + + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + + @@ -517,17 +543,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent feature-repo-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.opendaylight.odlparent @@ -413,7 +413,29 @@ - + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1123,17 +1145,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ - + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1121,17 +1143,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent mdsal-it-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.opendaylight.controller @@ -413,6 +413,29 @@ + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1124,17 +1147,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent odlparent-lite - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.opendaylight.odlparent @@ -419,6 +419,29 @@ + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1156,17 +1179,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent odlparent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.opendaylight.odlparent @@ -413,7 +413,29 @@ - + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1123,17 +1145,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent odlparent-aggregator - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.onap.ccsdk.parent parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} 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 @@ pom org.onap.ccsdk.parent single-feature-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.opendaylight.odlparent @@ -416,7 +416,29 @@ - + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -1158,17 +1180,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - org.codehaus.mojo versions-maven-plugin diff --git a/pom.xml b/pom.xml index a127ed32..2701d778 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} @@ -27,6 +27,31 @@ + + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + + @@ -37,17 +62,7 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - ${onap.nexus.staging.profile-id} - ${onap.nexus.staging.server-id} - - + 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 @@ pom org.onap.ccsdk.parent springboot-aggregator - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.onap.ccsdk.parent parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} 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 @@ pom org.onap.ccsdk.parent spring-boot-1-starter-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.springframework.boot @@ -327,7 +327,29 @@ - + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -946,17 +968,7 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - + org.codehaus.mojo versions-maven-plugin 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 @@ pom org.onap.ccsdk.parent spring-boot-starter-parent - 1.1.3-SNAPSHOT + 1.1.4-SNAPSHOT org.springframework.boot @@ -327,7 +327,29 @@ - + + nexus-staging + + + !altDeploymentRepository + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + https://nexus.onap.org + 176c31dfe190a + ecomp-staging + + + + + @@ -946,17 +968,7 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ${onap.nexus.url} - 176c31dfe190a - ecomp-staging - - + org.codehaus.mojo versions-maven-plugin 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}