X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=b63b3ac581e1d9f8ce7e87809235ff0072805ede;hb=2d0abde46befe2ab7550d02a1e5f182317adb8ec;hp=59084ae5080659b0ee0641dc8ff0a6c44a7e1f06;hpb=413da52a6cfd376abea7f1c1342edfd105c37ff4;p=dmaap%2Fkafka11aaf.git

diff --git a/pom.xml b/pom.xml
index 59084ae..b63b3ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
 	<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>
@@ -152,7 +152,7 @@
 								<artifactItem>
 									<groupId>org.onap.dmaap.messagerouter.mirroragent</groupId>
 									<artifactId>dmaapMMAgent</artifactId>
-									<version>1.1.1-SNAPSHOT</version>
+									<version>1.1.1</version>
 									<destFileName>dmaapMMAgent.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
@@ -160,35 +160,12 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-enforcer-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>enforce-no-snapshots</id>
-						<goals>
-							<goal>enforce</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<requireReleaseDeps>
-									<message>No Snapshots Allowed!</message>
-									<excludes>
-										<exclude>org.onap.dmaap.messagerouter.mirroragent:dmaapMMAgent</exclude>
-									</excludes>
-								</requireReleaseDeps>
-							</rules>
-							<fail>true</fail>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>com.spotify</groupId>
 				<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>
@@ -229,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>
@@ -242,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>
@@ -255,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>
@@ -267,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>
@@ -397,15 +374,11 @@
                                     </properties>
                                     <source>
                                         println project.properties['ver'];
-                                        def versionArray;
-                                        if ( project.properties['ver'] != null ) {
-                                        versionArray = project.properties['ver'].split('\\.');
-                                        }
                                         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']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
+                                        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'];