From 7a3fdbe253f2f4c7cf407d27fbd0bc990fdca817 Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Thu, 9 May 2019 19:19:54 +0000 Subject: [PATCH] Unify versions of artifacts from this repo patch set 2: put parent/version.properties in each docker image Change-Id: I41daa74dc9fcd36a5807522338f4c732fbb0d40e Signed-off-by: dglFromAtt Issue-ID: DMAAP-1194 Signed-off-by: dglFromAtt --- dbc-client/pom.xml | 4 ++-- dbc-client/version.properties | 35 ----------------------------------- dmaap-bc/pom.xml | 7 +++++-- dmaap-bc/version.properties | 35 ----------------------------------- pom.xml | 9 +++++---- version.properties | 2 +- 6 files changed, 13 insertions(+), 79 deletions(-) delete mode 100644 dbc-client/version.properties delete mode 100644 dmaap-bc/version.properties diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml index 5480569..f5fa4af 100644 --- a/dbc-client/pom.xml +++ b/dbc-client/pom.xml @@ -140,7 +140,7 @@ ${basedir}/target/docker-stage/opt/app/dbc-client/etc - ${basedir} + ${multiproject.basedir} version.properties @@ -270,7 +270,7 @@ 9.4.12.RC2 1.0.0 1.5.19 - 1.0.9 + 1.1.6 0.7.7.201606060606 3.2 diff --git a/dbc-client/version.properties b/dbc-client/version.properties deleted file mode 100644 index 8f72e5e..0000000 --- a/dbc-client/version.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# 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============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -### - -# Versioning variables -# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -# because they are used in Jenkins, whose plug-in doesn't support - -major=1 -minor=0 -patch=9 -base_version=${major}.${minor}.${patch} - -# Release must be completed with git revision # in Jenkins -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT diff --git a/dmaap-bc/pom.xml b/dmaap-bc/pom.xml index 5ad1ad8..a66a233 100644 --- a/dmaap-bc/pom.xml +++ b/dmaap-bc/pom.xml @@ -216,9 +216,10 @@ logback.xml + ${basedir}/target/docker-stage/opt/app/dmaapbc/etc - ${basedir} + ${multiproject.basedir} version.properties @@ -469,7 +470,9 @@ 9.4.12.RC2 1.0.0 1.5.19 - 1.1.5 + 1.1.6 + ${maven.build.timestamp} + yyyy-MM-dd HH:mm 0.7.7.201606060606 3.2 diff --git a/dmaap-bc/version.properties b/dmaap-bc/version.properties deleted file mode 100644 index 5c6ee95..0000000 --- a/dmaap-bc/version.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# 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============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -### - -# Versioning variables -# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -# because they are used in Jenkins, whose plug-in doesn't support - -major=1 -minor=1 -patch=5 -base_version=${major}.${minor}.${patch} - -# Release must be completed with git revision # in Jenkins -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT diff --git a/pom.xml b/pom.xml index d200867..acbb06d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,17 +22,18 @@ 4.0.0 org.onap.dmaap.buscontroller parent - 1.1.3-SNAPSHOT + ${artifactVersion}-SNAPSHOT dmaap-buscontroller pom - org.onap.oparent - oparent - 1.2.2 + org.onap.oparent + oparent + 1.2.2 + 1.1.6 ${basedir} 1.0.0 true diff --git a/version.properties b/version.properties index fcbb908..c4a26a4 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=1 -patch=4 +patch=6 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins -- 2.16.6