From 0586da4e5172ea4508b62698ded43c6c59eb7d6d Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 17 Jul 2019 10:43:14 -0400 Subject: [PATCH] Remove staging plugin Remove staging-profile, which had been needed for daily builds in old daily build jobs. Change-Id: I13d1b628268f46d59ff4521ffebf2f6d3b2b6390 Issue-ID: CCSDK-1496 Signed-off-by: Timoney, Dan (dt5972) --- dependencies-bom/pom.xml | 2 +- dependencies-odl-bom/pom.xml | 2 +- odlparent/binding-parent/pom.xml | 28 +- odlparent/bundle-parent/pom.xml | 28 +- odlparent/client-parent/pom.xml | 29 +- odlparent/feature-repo-parent/pom.xml | 28 +- odlparent/mdsal-it-parent/pom.xml | 28 +- odlparent/odlparent-lite/pom.xml | 28 +- odlparent/odlparent/pom.xml | 28 +- odlparent/pom.xml | 4 +- odlparent/setup/pom.xml | 4 +- .../setup/src/main/resources/pom-template.xml | 24 +- odlparent/single-feature-parent/pom.xml | 28 +- pom.xml | 28 +- springboot/pom.xml | 4 +- springboot/springboot1/pom.xml | 28 +- springboot/springboot2/pom.xml | 28 +- standalone/pom.xml | 395 +++++++++++---------- version.properties | 2 +- 19 files changed, 248 insertions(+), 498 deletions(-) diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 1ef2faf9..1b50df61 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent dependencies-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 6be92992..3cf788d8 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -7,7 +7,7 @@ pom org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.odlparent diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 30c9ab2d..c48d9dcb 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent binding-parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.mdsal @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - - - - - + yang-compile @@ -537,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index dda8a6f9..a8996246 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent bundle-parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.odlparent @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - - - - - + yang-compile @@ -537,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/odlparent/client-parent/pom.xml b/odlparent/client-parent/pom.xml index 2304952e..b9de9164 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.3.0-SNAPSHOT + 1.3.1-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} http://wiki.onap.org @@ -341,32 +341,7 @@ https://nexus.onap.org/content/repositories/snapshots - - - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - 176c31dfe190a - ecomp-staging - - - - - - + diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index 513081db..bca3619b 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent feature-repo-parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.odlparent @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - - - - - + yang-compile @@ -537,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index fae7c4f4..a47bff8e 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent mdsal-it-parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.controller @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - - - - - + yang-compile @@ -537,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index c3be3cbd..3bc836f5 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent odlparent-lite - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.odlparent @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - - - - - + yang-compile @@ -537,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index 076258bc..145729c1 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent odlparent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.odlparent @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - - - - - + yang-compile @@ -537,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/odlparent/pom.xml b/odlparent/pom.xml index 94301b74..9b59aee3 100755 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent odlparent-aggregator - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.ccsdk.parent parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/odlparent/setup/pom.xml b/odlparent/setup/pom.xml index d28f0517..bb500277 100755 --- a/odlparent/setup/pom.xml +++ b/odlparent/setup/pom.xml @@ -8,12 +8,12 @@ pom org.onap.ccsdk.parent setup - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.ccsdk.parent odlparent-aggregator - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index cbd808d2..8c18ee2c 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - 176c31dfe190a - ecomp-staging - - - - - + yang-compile diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index 76d7a58f..d3b98f6c 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.parent single-feature-parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.opendaylight.odlparent @@ -449,29 +449,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://nexus.onap.org - 176c31dfe190a - ecomp-staging - - - - - + yang-compile @@ -537,7 +515,7 @@ org.onap.ccsdk.parent dependencies-odl-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 46c88fdb..992f9283 100755 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ pom org.onap.ccsdk.parent parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} @@ -28,32 +28,6 @@ - - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - 176c31dfe190a - ecomp-staging - - - - - - - diff --git a/springboot/pom.xml b/springboot/pom.xml index 606f23fc..aaf982b5 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -7,12 +7,12 @@ pom org.onap.ccsdk.parent springboot-aggregator - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.onap.ccsdk.parent parent - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT ONAP :: ${project.groupId} :: ${project.artifactId} diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index d86bb535..bc97b27a 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.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.springframework.boot @@ -332,30 +332,6 @@ - - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - 176c31dfe190a - ecomp-staging - - - - - @@ -365,7 +341,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 1bc6a497..62ba02b2 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.3.0-SNAPSHOT + 1.3.1-SNAPSHOT org.springframework.boot @@ -346,29 +346,7 @@ - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - 176c31dfe190a - ecomp-staging - - - - - + @@ -378,7 +356,7 @@ org.onap.ccsdk.parent dependencies-bom - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT pom import diff --git a/standalone/pom.xml b/standalone/pom.xml index 1e68cdb6..107918e6 100755 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -1,189 +1,212 @@ - - - 4.0.0 - pom - org.onap.ccsdk.parent - standalone-parent - 1.3.0-SNAPSHOT - - - http://wiki.onap.org - ONAP :: ${project.groupId} :: ${project.artifactId} - Root POM to be used in place of oparent for CCSDK based projects - - - org.onap.oparent - oparent - 2.0.0 - - - - JIRA - https://jira.onap.org/ - - - - - - - https://nexus.onap.org - nexus.onap.org - 443 - https - https://nexus.onap.org/content/groups/public - https://nexus.onap.org/content/groups/staging - https://nexus.onap.org/content/repositories/releases - https://nexus.onap.org/content/repositories/snapshots - ecomp-staging - 176c31dfe190a - - - 1.8 - 1.8 - 2.5.0 - true - - - java - jacoco - ${project.build.directory}/surefire-reports - true - ${project.version} - - - - 2.1.1 - 2.9.8 - 2.0 - - 1.1.5 - 1.3.0 - 1.5.0 - - - - - - - - org.onap.sdc.sdc-distribution-client - sdc-distribution-client - ${sdc.client.version} - compile - - - org.onap.sdc.sdc-tosca - sdc-tosca - ${sdc.tosca.version} - compile - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - ${dmaap.listener.version} - - - org.slf4j - slf4j-api - 1.7.21 - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.11.2 - - - com.fasterxml.jackson.core - jackson-core - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${fasterxml.jackson.version} - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - junit - junit - 4.12 - test - - - org.mockito - mockito-core - 1.10.19 - test - - - org.testng - testng - 6.11 - test - - - ch.vorburger.mariaDB4j - mariaDB4j - 2.2.3 - test - - - - - - - - nexus-staging - - - !altDeploymentRepository - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - https://${onap.nexus.host} - 176c31dfe190a - ecomp-staging - - - - - - - - - - - - org.codehaus.mojo - versions-maven-plugin - 2.5 - - true - - - - - - ONAP - + 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"> + + + 4.0.0 + pom + org.onap.ccsdk.parent + standalone-parent + 1.3.1-SNAPSHOT + + + http://wiki.onap.org + ONAP :: ${project.groupId} :: ${project.artifactId} + Root POM to be used in place of oparent for CCSDK based projects + + + org.onap.oparent + oparent + 2.0.0 + + + + JIRA + https://jira.onap.org/ + + + + + + + https://nexus.onap.org + nexus.onap.org + 443 + https + https://nexus.onap.org/content/groups/public + https://nexus.onap.org/content/groups/staging + https://nexus.onap.org/content/repositories/releases + https://nexus.onap.org/content/repositories/snapshots + ecomp-staging + 176c31dfe190a + + + 1.8 + 1.8 + 2.5.0 + true + + + java + jacoco + ${project.build.directory}/surefire-reports + true + ${project.version} + + + + 2.1.1 + 2.9.8 + 2.0 + + 1.1.5 + 1.3.0 + 1.5.0 + + + + + + + + org.onap.sdc.sdc-distribution-client + sdc-distribution-client + ${sdc.client.version} + compile + + + org.onap.sdc.sdc-tosca + sdc-tosca + ${sdc.tosca.version} + compile + + + org.onap.dmaap.messagerouter.dmaapclient + dmaapClient + ${dmaap.listener.version} + + + org.slf4j + slf4j-api + 1.7.21 + + + org.apache.logging.log4j + log4j-slf4j-impl + 2.11.2 + + + com.fasterxml.jackson.core + jackson-core + ${fasterxml.jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${fasterxml.jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${fasterxml.jackson.version} + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + junit + junit + 4.12 + test + + + org.mockito + mockito-core + 1.10.19 + test + + + org.testng + testng + 6.11 + test + + + ch.vorburger.mariaDB4j + mariaDB4j + 2.2.3 + test + + + + + + + onap-public + https://nexus.onap.org/content/groups/public + + true + never + + + true + always + + + + onap-staging + https://nexus.onap.org/content/groups/staging + + true + never + + + true + always + + + + ecomp-release + onap-repository-releases + https://nexus.onap.org/content/repositories/releases + + true + never + + + false + + + + ecomp-snapshot + onap-repository-snapshots + https://nexus.onap.org/content/repositories/snapshots + + false + + + true + + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.5 + + true + + + + + + ONAP + diff --git a/version.properties b/version.properties index 8e5be7b0..beacb7c7 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=1 sprint_number=3 -feature_revision=0 +feature_revision=1 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6