From a04ce6f0ff17906216a551f2418c59cb3294d3bb Mon Sep 17 00:00:00 2001
From: "sunil.unnava" <sunil.unnava@att.com>
Date: Mon, 15 Apr 2019 12:49:19 -0400
Subject: move API Keys copy to docker image

Issue-ID: DMAAP-1144
Change-Id: I2416f009166807d6cdece1916648898b05abcf7e
Signed-off-by: sunil.unnava <sunil.unnava@att.com>
---
 pom.xml                                    |  4 ++--
 src/main/docker/Dockerfile                 |  3 ++-
 src/main/docker/scripts/start-zookeeper.sh | 10 ++++++++++
 version.properties                         |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2337c8a..6f800dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,8 +20,8 @@
 	</parent>
 
 	<groupId>org.onap.dmaap.zookeeper</groupId>
-	<artifactId>zookeepr</artifactId>
-	<version>4.0.0-SNAPSHOT</version>
+	<artifactId>zookeeper</artifactId>
+	<version>5.0.0-SNAPSHOT</version>
 	<name>zookeeper</name>
 	<licenses>
 		<license>
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 6dd0076..5a079f1 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -11,9 +11,10 @@ ARG ZK_DIST=zookeeper-3.4.9
 RUN set -x \
     && apt-get update \
     && apt-get install -y openjdk-8-jre-headless wget netcat-openbsd \
+    && apt-get install -y git \
     && wget -q "http://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz" \
     && wget -q "http://archive.apache.org/dist/zookeeper/$ZK_DIST/$ZK_DIST.tar.gz.asc" \
-   && tar -xzf "$ZK_DIST.tar.gz" -C /opt \
+    && tar -xzf "$ZK_DIST.tar.gz" -C /opt \
     && rm -r  "$ZK_DIST.tar.gz" "$ZK_DIST.tar.gz.asc" \
     && ln -s /opt/$ZK_DIST /opt/zookeeper \
     && rm -rf /opt/zookeeper/CHANGES.txt \
diff --git a/src/main/docker/scripts/start-zookeeper.sh b/src/main/docker/scripts/start-zookeeper.sh
index 446cbc4..4585568 100644
--- a/src/main/docker/scripts/start-zookeeper.sh
+++ b/src/main/docker/scripts/start-zookeeper.sh
@@ -106,6 +106,16 @@ function create_data_dirs() {
         mkdir -p $ZK_DATA_DIR
         chown -R $ZK_USER:$ZK_USER $ZK_DATA_DIR
     fi
+    
+    if [ -d $ZK_DATA_DIR/version-2 ]; then
+          echo "API Keys already loaded";
+          else
+          git clone -b master --single-branch http://gerrit.onap.org/r/dmaap/messagerouter/messageservice.git /tmp/zookeeper/gerrit
+          cp -var /tmp/zookeeper/gerrit/oom-topics/data-zookeeper/* $ZK_DATA_DIR;
+          chown -R $ZK_USER:$ZK_USER /tmp/zookeeper/gerrit
+          rm -rf /tmp/zookeeper/gerrit;
+          echo "Copying API Keys completed.";
+     fi
 
     if [ ! -d $ZK_DATA_LOG_DIR  ]; then
         mkdir -p $ZK_DATA_LOG_DIR
diff --git a/version.properties b/version.properties
index 76775d1..fb3ad80 100644
--- a/version.properties
+++ b/version.properties
@@ -24,7 +24,7 @@
 # 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=4
+major=5
 minor=0
 patch=0
 
-- 
cgit 1.2.3-korg