From 8bbe748d631353b8c48c7d71eb733cf85712884c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20D=C3=BCrre?= Date: Fri, 7 Feb 2020 07:23:27 +0100 Subject: [PATCH] fixed sdnc-web pom MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit fixed parent and also some other props sync to sdnc-image Issue-ID: SDNC-1064 Signed-off-by: Michael Dürre Change-Id: I7807e6298da407d0e87db24e6b95b32d4655c5f7 Signed-off-by: Michael Dürre Former-commit-id: b5cd53a8da9d5a4707875e97d6975097217e9545 --- installation/sdnc-web/pom.xml | 63 ++++++++++------------ .../sdnc-web/src/main/scripts/TagVersion.groovy | 41 -------------- 2 files changed, 27 insertions(+), 77 deletions(-) delete mode 100644 installation/sdnc-web/src/main/scripts/TagVersion.groovy diff --git a/installation/sdnc-web/pom.xml b/installation/sdnc-web/pom.xml index bf91b5c6..1ae66ab6 100644 --- a/installation/sdnc-web/pom.xml +++ b/installation/sdnc-web/pom.xml @@ -6,7 +6,6 @@ org.onap.ccsdk.parent odlparent-lite 1.5.1 - org.onap.sdnc.oam @@ -15,20 +14,19 @@ pom sdnc-oam :: installation :: ${project.artifactId} - Creates SDN Controller Docker container + Creates SDN Controller WebUI Docker container docker.io/bitnami/nginx:1.16-debian-9 - oof-pci/ccsdk-odlwt-webserver - ${maven.build.timestamp} + onap/sdnc-web-image + ${project.version} + ${maven.build.timestamp} org.onap.ccsdk.features.sdnr.wt 0.7.1-SNAPSHOT - ${project.version} ${https_proxy} yyyyMMdd'T'HHmmss'Z' deploy true - 93C4A3FD7BB9C367 @@ -41,16 +39,16 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-odlux-apps-installer ${ccsdk.features.version} - repo - zip + zip + repo + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-helpserver-installer + ${ccsdk.features.version} + zip + repo - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-helpserver-installer - ${ccsdk.features.version} - repo - zip - @@ -66,7 +64,7 @@ execute - ${basedir}/src/main/scripts/TagVersion.groovy + ${basedir}/../TagVersion.groovy @@ -79,7 +77,7 @@ copy-dockerfile copy-resources - + validate ${basedir}/target/docker-stage @@ -98,7 +96,7 @@ copy-siteconf copy-resources - + validate ${basedir}/target/docker-stage @@ -118,7 +116,7 @@ copy-scripts copy-resources - + validate ${basedir}/target/docker-stage/bin @@ -267,16 +265,16 @@ ${project.build.directory}/docker-stage/html odlux/* - - - ${ccsdk.groupId} - sdnr-wt-helpserver-provider - ${ccsdk.features.version} - jar - false - ${project.build.directory}/docker-stage/html - help/* - + + + ${ccsdk.groupId} + sdnr-wt-helpserver-provider + ${ccsdk.features.version} + jar + false + ${project.build.directory}/docker-stage/html + help/* + @@ -323,12 +321,5 @@ - - - org.apache.maven.wagon - wagon-http-lightweight - 2.2 - - diff --git a/installation/sdnc-web/src/main/scripts/TagVersion.groovy b/installation/sdnc-web/src/main/scripts/TagVersion.groovy deleted file mode 100644 index 16880561..00000000 --- a/installation/sdnc-web/src/main/scripts/TagVersion.groovy +++ /dev/null @@ -1,41 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CCSDK - * ================================================================================ - * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * =================================================================== - * - */ - -package org.onap.ccsdk.distribution - - -def versionArray; -if ( project.properties['ccsdk.features.version'] != null ) { - versionArray = project.properties['ccsdk.features.version'].split('\\.'); -} - -if ( project.properties['ccsdk.features.version'].endsWith("-SNAPSHOT") ) { - patchArray = versionArray[2].split('-'); - project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest"; - project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-latest"; - project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + patchArray[0] + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; -} else { - project.properties['project.docker.latestminortag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest"; - project.properties['project.docker.latestfulltag.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-latest"; - project.properties['project.docker.latesttagtimestamp.version']=versionArray[0] + '.' + versionArray[1] + '.' + versionArray[2] + "-STAGING-"+project.properties['ccsdk.build.timestamp']; -} -- 2.16.6