From a733d164955921366fe1440da7ea8c9875bc4794 Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Thu, 13 Jul 2017 08:28:54 -0400 Subject: [PATCH] [PORTAL-23] Use EPSDK 1.1.0 Upgrade to release version 1.1.0 of EPSDK libraries. Drop version suffix from final name of web app war file. Change-Id: Id03e2808445e59c18eafe3f635c09774ef3f0dba Signed-off-by: Christopher Lott (cl778h) --- LICENSE.txt | 4 ++-- dcae_dmaapbc_webapp/dbca-common/pom.xml | 7 +------ dcae_dmaapbc_webapp/dbca-os/pom.xml | 12 ++++-------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index b150a3c..2efb27f 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ /* * ==================================================================================== - * Copyright 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. * ==================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,5 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. * ==================================================================================== - * ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property. + * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ diff --git a/dcae_dmaapbc_webapp/dbca-common/pom.xml b/dcae_dmaapbc_webapp/dbca-common/pom.xml index 058170a..18d45c0 100644 --- a/dcae_dmaapbc_webapp/dbca-common/pom.xml +++ b/dcae_dmaapbc_webapp/dbca-common/pom.xml @@ -14,12 +14,11 @@ UTF-8 4.2.0.RELEASE 4.3.11.Final - 1.1.0-SNAPSHOT + 1.1.0 1.1.0-SNAPSHOT true https://nexus.onap.org /content/repositories/snapshots/ - /content/repositories/staging/ /content/repositories/releases/ @@ -28,10 +27,6 @@ snapshots-repo ${nexusproxy}${snapshotNexusPath} - - staging-repo - ${nexusproxy}${stagingNexusPath} - releases-repo ${nexusproxy}${releaseNexusPath} diff --git a/dcae_dmaapbc_webapp/dbca-os/pom.xml b/dcae_dmaapbc_webapp/dbca-os/pom.xml index 22c96f0..a13d293 100644 --- a/dcae_dmaapbc_webapp/dbca-os/pom.xml +++ b/dcae_dmaapbc_webapp/dbca-os/pom.xml @@ -5,7 +5,7 @@ org.openecomp.ui.dmaapbc dmaap-bc-app-os - 1.1.0-SNAPSHOT + 1.1.0 war DCAE DMaaP Bus Controller Webapp for ONAP DMaaP Bus Controller Web Application for open-source release @@ -16,12 +16,11 @@ true 4.2.0.RELEASE 4.3.11.Final - 1.1.0-SNAPSHOT + 1.1.0 1.1.0-SNAPSHOT **.js https://nexus.onap.org /content/repositories/snapshots/ - /content/repositories/staging/ /content/repositories/releases/ /content/sites/site/org/openecomp/ui/dmaapbc/${project.version} @@ -32,11 +31,6 @@ ecomp-snapshots ${nexusproxy}/${snapshotNexusPath} - - - ecomp-staging - ${nexusproxy}/${stagingNexusPath} - ecomp-releases @@ -45,6 +39,8 @@ + + ${project.artifactId} -- 2.16.6