From 7a3fdbe253f2f4c7cf407d27fbd0bc990fdca817 Mon Sep 17 00:00:00 2001
From: dglFromAtt <dgl@research.att.com>
Date: Thu, 9 May 2019 19:19:54 +0000
Subject: 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>
---
 dmaap-bc/pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'dmaap-bc/pom.xml')

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 @@
                           <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>
-- 
cgit 1.2.3-korg