update docker images

Issue-ID: DMAAP-913
Change-Id: I90452acb0206b0f63a5ca47c4e528a7af1e32af7
Signed-off-by: sunil unnava <sunil.unnava@att.com>

diff --git a/bundleconfig-local/etc/appprops/MsgRtrApi.properties b/bundleconfig-local/etc/appprops/MsgRtrApi.properties
index 4509159..b710554 100644 (file)
--- a/bundleconfig-local/etc/appprops/MsgRtrApi.properties
+++ b/bundleconfig-local/etc/appprops/MsgRtrApi.properties
@@ -138,6 +138,7 @@ cambria.consumer.cache.touchFreqMs=120000
 #metrics.send.cambria.sendEverySeconds=60
 
 cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache
+consumer.timeout=17
 
 ##############################################################################
 #100mb

diff --git a/demo/docker_files/__MsgRtrApi.properties b/demo/docker_files/__MsgRtrApi.properties
index 47293a7..ea6e089 100644 (file)
--- a/demo/docker_files/__MsgRtrApi.properties
+++ b/demo/docker_files/__MsgRtrApi.properties
@@ -102,7 +102,7 @@ authentication.adminSecret=fe3cCompound
 ## hostname is determined via InetAddress.getLocalHost ().getCanonicalHostName(),
 ## which is not always adequate.) You can set this value explicitly here.
 ##
-#cambria.api.node.identifier=<use-something-unique-to-this-instance>
+cambria.api.node.identifier=message-router
 
 ###############################################################################
 ##
@@ -115,6 +115,7 @@ authentication.adminSecret=fe3cCompound
 #metrics.send.cambria.sendEverySeconds=60
 
 cambria.consumer.cache.zkBasePath=/fe3c/cambria/consumerCache
+consumer.timeout=17
 
 ##############################################################################
 #100mb

diff --git a/demo/docker_files/__docker-compose.yml b/demo/docker_files/__docker-compose.yml
index e2fa2e7..94f8d93 100644 (file)
--- a/demo/docker_files/__docker-compose.yml
+++ b/demo/docker_files/__docker-compose.yml
@@ -6,11 +6,11 @@ networks:
       com.docker.network.driver.mtu: ${MTU}
 services:
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: nexus3.onap.org:10001/onap/dmaap/zookeeper:1.0.0
     ports:
       - "2181:2181"
     volumes:
-      - ./data-zookeeper:/opt/zookeeper-3.4.9/data
+      - ./data-zookeeper:/var/lib/zookeeper/data
     logging:
       driver: "json-file"
       options:
@@ -42,8 +42,6 @@ services:
       KAFKA_INTER_BROKER_LISTENER_NAME: INTERNAL_PLAINTEXT
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ./data-kafka:/kafka
-      - ./start-kafka.sh:/start-kafka.sh
     logging:
       driver: "json-file"
       options:
@@ -51,7 +49,7 @@ services:
         max-file: "5"
 
   dmaap:
-    image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.8
+    image: ${NEXUS_DOCKER_REPO}/onap/dmaap/dmaap-mr:1.1.9
     ports:
       - "3904:3904"
       - "3905:3905"

diff --git a/pom.xml b/pom.xml
index dc70135..0dbf611 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.1.10-SNAPSHOT</version>
+       <version>1.1.11-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
        <licenses>

diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml
index 8155413..ea8c596 100644 (file)
--- a/src/main/resources/docker-compose/docker-compose.yml
+++ b/src/main/resources/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: nexus3.onap.org:10001/onap/dmaap/zookeeper:1.0.0
     ports:
       - "2181:2181"
 
@@ -34,7 +34,7 @@ services:
     - zookeeper
 
   dmaap:
-    image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.8
+    image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.9
     ports:
       - "3904:3904"
       - "3905:3905"

diff --git a/version.properties b/version.properties
index 7ce0f80..8a7c886 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 
 major=1
 minor=1
-patch=10
+patch=11
 
 base_version=${major}.${minor}.${patch}