add userid to user

[dmaap/kafka11aaf.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index a8e16d5..ed245ce 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
 
        <groupId>org.onap.dmaap.kafka</groupId>
        <artifactId>kafka11aaf</artifactId>
-       <version>0.0.4-SNAPSHOT</version>
-       <name>dmaap-kafka11aaf</name>
+       <version>0.0.6-SNAPSHOT</version>
+       <name>dmaap-kafka</name>
        <licenses>
                <license>
                        <name>Apache License Version 2.0</name>
@@ -165,7 +165,7 @@
                                <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>
@@ -206,8 +206,8 @@
                                                        <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>
@@ -219,8 +219,8 @@
                                                        <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>
@@ -232,7 +232,7 @@
                                                        <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>
@@ -244,7 +244,7 @@
                                                        <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>
@@ -281,7 +281,7 @@
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <sitePath>/content/sites/site/org/onap/dmaap/kafka0111/${project.artifactId}/${project.version}</sitePath>
                <skip.docker.build>true</skip.docker.build>
                <skip.docker.push>true</skip.docker.push>
@@ -317,8 +317,8 @@
                </dependency>
                <dependency>
                        <groupId>org.apache.kafka</groupId>
-                       <artifactId>kafka_2.11</artifactId>
-                       <version>0.11.0.3</version>
+                       <artifactId>kafka_2.12</artifactId>
+                       <version>1.1.1</version>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
@@ -357,39 +357,43 @@
                                <skip.docker.push>false</skip.docker.push>
                        </properties>
                        <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.groovy.maven</groupId>
-                        <artifactId>gmaven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>validate</phase>
-                                <goals>
-                                    <goal>execute</goal>
-                                </goals>
-                                <configuration>
-                                    <properties>
-                                        <ver>${project.version}</ver>
-                                        <timestamp>${maven.build.timestamp}</timestamp>
-                                    </properties>
-                                    <source>
-                                        println project.properties['ver'];
-                                        if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
-                                        project.properties['dockertag1']=project.properties['ver'] + "-latest";
-                                        project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
-                                        } else {
-                                        project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
-                                        project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
-                                        }
-                                        println 'docker tag 1: ' + project.properties['dockertag1'];
-                                        println 'docker tag 2: ' + project.properties['dockertag2'];
-                                    </source>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    </plugins>
-                    </build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.codehaus.groovy.maven</groupId>
+                                               <artifactId>gmaven-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <phase>validate</phase>
+                                                               <goals>
+                                                                       <goal>execute</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <properties>
+                                                                               <ver>${project.version}</ver>
+                                                                               <timestamp>${maven.build.timestamp}</timestamp>
+                                                                       </properties>
+                                                                       <source>
+                                                                               println project.properties['ver'];
+                                                                               if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+                                                                               project.properties['dockertag1']=project.properties['ver'] +
+                                                                               "-latest";
+                                                                               project.properties['dockertag2']=project.properties['ver'] +
+                                                                               "-" + project.properties['timestamp'];
+                                                                               } else {
+                                                                               project.properties['dockertag1']=project.properties['ver'] +
+                                                                               "-STAGING-latest";
+                                                                               project.properties['dockertag2']=project.properties['ver'] +
+                                                                               "-STAGING-" + project.properties['timestamp'];
+                                                                               }
+                                                                               println 'docker tag 1: ' + project.properties['dockertag1'];
+                                                                               println 'docker tag 2: ' + project.properties['dockertag2'];
+                                                                       </source>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
                </profile>
 
        </profiles>