diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-13 08:28:54 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-13 08:30:29 -0400 |
| commit | a733d164955921366fe1440da7ea8c9875bc4794 (patch) | |
| tree | 9902ddeed4c4cc285ebf46cb15243ec14648965d | |
| parent | fe6c70997442979fe03cd417d271aa52e638c5d7 (diff) | |
[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) <clott@research.att.com>
| -rw-r--r-- | LICENSE.txt | 4 | ||||
| -rw-r--r-- | dcae_dmaapbc_webapp/dbca-common/pom.xml | 7 | ||||
| -rw-r--r-- | 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 @@ <encoding>UTF-8</encoding> <springframework.version>4.2.0.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> - <epsdk.version>1.1.0-SNAPSHOT</epsdk.version> + <epsdk.version>1.1.0</epsdk.version> <dbca.version>1.1.0-SNAPSHOT</dbca.version> <skipTests>true</skipTests> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> - <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> </properties> @@ -29,10 +28,6 @@ <url>${nexusproxy}${snapshotNexusPath}</url> </repository> <repository> - <id>staging-repo</id> - <url>${nexusproxy}${stagingNexusPath}</url> - </repository> - <repository> <id>releases-repo</id> <url>${nexusproxy}${releaseNexusPath}</url> </repository> 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 @@ <groupId>org.openecomp.ui.dmaapbc</groupId> <artifactId>dmaap-bc-app-os</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> <packaging>war</packaging> <name>DCAE DMaaP Bus Controller Webapp for ONAP</name> <description>DMaaP Bus Controller Web Application for open-source release</description> @@ -16,12 +16,11 @@ <skiptests>true</skiptests> <springframework.version>4.2.0.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> - <epsdk.version>1.1.0-SNAPSHOT</epsdk.version> + <epsdk.version>1.1.0</epsdk.version> <dbca.version>1.1.0-SNAPSHOT</dbca.version> <sonar.exclusions>**.js</sonar.exclusions> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> - <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> <sitePath>/content/sites/site/org/openecomp/ui/dmaapbc/${project.version}</sitePath> </properties> @@ -33,11 +32,6 @@ <url>${nexusproxy}/${snapshotNexusPath}</url> </repository> <repository> - <!-- Staging repository has ECOMP staging artifacts --> - <id>ecomp-staging</id> - <url>${nexusproxy}/${stagingNexusPath}</url> - </repository> - <repository> <!-- Releases repository has ECOMP release artifacts --> <id>ecomp-releases</id> <url>${nexusproxy}/${releaseNexusPath}</url> @@ -45,6 +39,8 @@ </repositories> <build> + <!-- The war file name carries no version number --> + <finalName>${project.artifactId}</finalName> <plugins> <!-- Compile to Java 1.8 class output format --> |