revert pom changes for image optimization

[dmaap/kafka11aaf.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 59084ae..a8e16d5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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,29 +160,6 @@
                                        </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>
@@ -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'];