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 <dgl@research.att.com>
Issue-ID: DMAAP-1194
Signed-off-by: dglFromAtt <dgl@research.att.com>

diff --git a/dbc-client/pom.xml b/dbc-client/pom.xml
index 5480569..f5fa4af 100644 (file)
--- a/dbc-client/pom.xml
+++ b/dbc-client/pom.xml
@@ -140,7 +140,7 @@
                 </resource>
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dbc-client/etc</targetPath>
-                    <directory>${basedir}</directory>
+                    <directory>${multiproject.basedir}</directory>
                         <includes>
                             <include>version.properties</include>
                         </includes>
@@ -270,7 +270,7 @@
     <jettyVersion>9.4.12.RC2</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.0.9</artifact.version>
+    <artifact.version>1.1.6</artifact.version>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>

diff --git a/dbc-client/version.properties b/dbc-client/version.properties
deleted file mode 100644 (file)
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 (file)
--- a/dmaap-bc/pom.xml
+++ b/dmaap-bc/pom.xml
@@ -216,9 +216,10 @@
                           <include>logback.xml</include>
                         </includes>
                 </resource>
+
                  <resource>
                     <targetPath>${basedir}/target/docker-stage/opt/app/dmaapbc/etc</targetPath>
-                    <directory>${basedir}</directory>
+                    <directory>${multiproject.basedir}</directory>
                         <includes>
                             <include>version.properties</include>
                         </includes>
@@ -469,7 +470,9 @@
     <jettyVersion>9.4.12.RC2</jettyVersion>
     <eelf.version>1.0.0</eelf.version>
     <swagger.version>1.5.19</swagger.version>
-    <artifact.version>1.1.5</artifact.version>
+    <artifact.version>1.1.6</artifact.version>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
     <!--  SONAR  -->
     <jacoco.version>0.7.7.201606060606</jacoco.version>
     <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>

diff --git a/dmaap-bc/version.properties b/dmaap-bc/version.properties
deleted file mode 100644 (file)
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 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,17 +22,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.onap.dmaap.buscontroller</groupId>
   <artifactId>parent</artifactId>
-  <version>1.1.3-SNAPSHOT</version>
+  <version>${artifactVersion}-SNAPSHOT</version>
   <name>dmaap-buscontroller</name>
   <packaging>pom</packaging>
   
   <parent>
-  <groupId>org.onap.oparent</groupId>
-  <artifactId>oparent</artifactId>
-  <version>1.2.2</version>
+       <groupId>org.onap.oparent</groupId>
+       <artifactId>oparent</artifactId>
+       <version>1.2.2</version>
   </parent>
 
   <properties>
+    <artifactVersion>1.1.6</artifactVersion>
     <multiproject.basedir>${basedir}</multiproject.basedir>
         <docker.maven.plugin.version>1.0.0</docker.maven.plugin.version>
         <skip.docker.build>true</skip.docker.build>

diff --git a/version.properties b/version.properties
index fcbb908..c4a26a4 100644 (file)
--- 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