upgrade Kafka version to 1.1.1

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

diff --git a/pom.xml b/pom.xml
index a8e16d5..b63b3ac 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
        <groupId>org.onap.dmaap.kafka</groupId>
        <artifactId>kafka11aaf</artifactId>
 
        <groupId>org.onap.dmaap.kafka</groupId>
        <artifactId>kafka11aaf</artifactId>

-       <version>0.0.4-SNAPSHOT</version>
+       <version>0.0.5-SNAPSHOT</version>

        <name>dmaap-kafka11aaf</name>
        <licenses>
                <license>
        <name>dmaap-kafka11aaf</name>
        <licenses>
                <license>


@@ -165,7 +165,7 @@
                                <artifactId>docker-maven-plugin</artifactId>
                                <version>1.0.0</version>
                                <configuration>
                                <artifactId>docker-maven-plugin</artifactId>
                                <version>1.0.0</version>
                                <configuration>

-                                       <imageName>onap/dmaap/kafka01101</imageName>
+                                       <imageName>onap/dmaap/kafka111</imageName>

                                        <dockerDirectory>src/main/docker</dockerDirectory>
                                        <serverId>docker-hub</serverId>
                                        <imageTags>
                                        <dockerDirectory>src/main/docker</dockerDirectory>
                                        <serverId>docker-hub</serverId>
                                        <imageTags>


@@ -206,8 +206,8 @@
                                                        <goal>tag</goal>
                                                </goals>
                                                <configuration>
                                                        <goal>tag</goal>
                                                </goals>
                                                <configuration>

-                                                       <image>onap/dmaap/kafka01101</image>
-                                                       <newName>${docker.push.registry}/onap/dmaap/kafka01101:${dockertag2}</newName>
+                                                       <image>onap/dmaap/kafka111</image>
+                                                       <newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</newName>

                                                        <skipDockerTag>${skip.docker.push}</skipDockerTag>
                                                </configuration>
                                        </execution>
                                                        <skipDockerTag>${skip.docker.push}</skipDockerTag>
                                                </configuration>
                                        </execution>


@@ -219,8 +219,8 @@
                                                        <goal>tag</goal>
                                                </goals>
                                                <configuration>
                                                        <goal>tag</goal>
                                                </goals>
                                                <configuration>

-                                                       <image>onap/dmaap/kafka01101</image>
-                                                       <newName>${docker.push.registry}/onap/dmaap/kafka01101:${dockertag1}</newName>
+                                                       <image>onap/dmaap/kafka111</image>
+                                                       <newName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</newName>

                                                        <skipDockerTag>${skip.docker.push}</skipDockerTag>
                                                </configuration>
                                        </execution>
                                                        <skipDockerTag>${skip.docker.push}</skipDockerTag>
                                                </configuration>
                                        </execution>


@@ -232,7 +232,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>

-                                                       <imageName>${docker.push.registry}/onap/dmaap/kafka01101:${dockertag2}</imageName>
+                                                       <imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag2}</imageName>

                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>
                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>


@@ -244,7 +244,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>

-                                                       <imageName>${docker.push.registry}/onap/dmaap/kafka01101:${dockertag1}</imageName>
+                                                       <imageName>${docker.push.registry}/onap/dmaap/kafka111:${dockertag1}</imageName>

                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>
                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>

diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index b7f303d..d837fb9 100644 (file)
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM anapsix/alpine-java
 
 FROM anapsix/alpine-java
 

-ARG kafka_version=0.11.0.1
+ARG kafka_version=1.1.1

 ARG scala_version=2.12
 
 
 ARG scala_version=2.12
 
 

diff --git a/version.properties b/version.properties
index 2ec675c..1389c31 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -26,7 +26,7 @@
 
 major=0
 minor=0
 
 major=0
 minor=0

-patch=4
+patch=5

 
 base_version=${major}.${minor}.${patch}
 
 
 base_version=${major}.${minor}.${patch}