X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=aa96b8a815c174f57666d39a28d4c4833db4907a;hb=eb5b12c7ce09506af6923c1c7bb58dc060514a37;hp=6f731f81cbb8d021bb07cc8a69d7eabb464c7639;hpb=0c4500afd225801c940b309a2615b1afe3c505c8;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 6f731f81..aa96b8a8 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -3,15 +3,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>2.1.0</version>
-        <relativePath/>
+        <groupId>org.onap.ccsdk.distribution</groupId>
+        <artifactId>distribution-odlsli</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -21,312 +18,299 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-silicon-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
+
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
-	<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
-	<uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag>
-        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-        <opendaylight.root>opt/opendaylight</opendaylight.root>
-        <docker.push.phase>deploy</docker.push.phase>
+	    <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
+
         <docker.verbose>true</docker.verbose>
+
+        <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+        <opendaylight.root>opt/opendaylight</opendaylight.root>
+
         <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-        <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040
+        <odl.features.extra>
+            odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040
         </odl.features.extra>
         <ccsdk.odl.features>
-            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
+            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all
         </ccsdk.odl.features>
         <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-
-        <ccsdk.features.version>1.1.0</ccsdk.features.version>
-        <ccsdk.sli.core.version>1.1.0</ccsdk.sli.core.version>
-        <ccsdk.sli.adaptors.version>1.1.0</ccsdk.sli.adaptors.version>
-        <ccsdk.sli.northbound.version>1.1.0</ccsdk.sli.northbound.version>
-        <ccsdk.sli.plugins.version>1.1.0</ccsdk.sli.plugins.version>
-        <ccsdk.oran.a1adapter.version>1.1.0</ccsdk.oran.a1adapter.version>
+        <!-- All Version definition is placed in org.onap.ccsdk.parent/oparent -->
+        <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
-</properties>
+    </properties>
 
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>dependencies</artifactId>
             <version>${project.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>filters-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliapi-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>utils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>slicore-features-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>aai-service-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>ansible-adapter-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <artifactId>ansible-adaptor-installer</artifactId>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>base-http-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>mdsal-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
             <artifactId>publisher.installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>netbox-client-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>resource-assignment-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-            <artifactId>saltstack-adapter-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <artifactId>saltstack-adaptor-installer</artifactId>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sliadaptors-features-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>asdcApi-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>dataChange-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>lcm-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>slinorthbound-features-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>properties-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>template-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restconf-client-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sshapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sliplugins-features-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-            <classifier>repo</classifier>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features</groupId>
             <artifactId>features-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features</groupId>
             <artifactId>aafshiro-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>sdnr-northbound-features-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.oran</groupId>
             <artifactId>a1-adapter-northbound-installer</artifactId>
             <version>${ccsdk.oran.a1adapter.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>oofpcipoc-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.oran</groupId>
             <artifactId>a1-adapter-installer</artifactId>
             <version>${ccsdk.oran.a1adapter.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>CMNotify-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
             <artifactId>ranSlice-installer</artifactId>
             <version>${ccsdk.features.version}</version>
-            <classifier>repo</classifier>
             <type>zip</type>
+            <classifier>repo</classifier>
         </dependency>
     </dependencies>
 
     <build>
-        <extensions>
-            <extension>
-                <!-- this extension is required by wagon in order to pass the proxy -->
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-http-lightweight</artifactId>
-                <version>2.2</version>
-            </extension>
-        </extensions>
         <plugins>
-
-
             <plugin>
                 <groupId>org.codehaus.groovy.maven</groupId>
                 <artifactId>gmaven-plugin</artifactId>
+                <version>1.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -339,8 +323,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.6</version>
@@ -349,7 +331,8 @@
                         <id>copy-dockerfile</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -364,12 +347,12 @@
                             </resources>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>copy-scripts</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory>
@@ -384,12 +367,12 @@
                             </resources>
                         </configuration>
                     </execution>
-
                     <execution>
                         <id>copy-odl-resources</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -411,7 +394,8 @@
                         <id>copy-config</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -430,7 +414,8 @@
                         <id>copy-data</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory>
@@ -449,7 +434,8 @@
                         <id>copy-properties</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties
@@ -470,7 +456,8 @@
                         <id>copy-keystores</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory>
@@ -524,30 +511,21 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
                 <executions>
-
                     <execution>
-                        <id>change shell permissions</id>
+                        <id>change-shell-permissions</id>
                         <phase>process-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
                         <configuration>
-                            <executable>/usr/bin/find</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                <argument>-name</argument>
-                                <argument>*.sh</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
+                            <target>
+                                <chmod dir="${basedir}/target/docker-stage/opt/onap/ccsdk" perm="+x" includes="**/*.sh"/>
+                            </target>
                         </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
                     </execution>
                 </executions>
             </plugin>
@@ -555,18 +533,25 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
-                  <execution>
-                    <goals>
-                      <goal>integration-test</goal>
-                      <goal>verify</goal>
-                    </goals>
-                  </execution>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
                 </executions>
                 <configuration>
-                  <skipITs>true</skipITs>
+                    <skipITs>true</skipITs>
                 </configuration>
-              </plugin>
+            </plugin>
         </plugins>
+        <extensions>
+            <extension><!-- this extension is required by wagon in order to pass the proxy -->
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-http-lightweight</artifactId>
+                <version>2.2</version>
+            </extension>
+        </extensions>
     </build>
 
     <profiles>
@@ -578,24 +563,24 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-failsafe-plugin</artifactId>
                         <executions>
-                          <execution>
-                            <goals>
-                              <goal>integration-test</goal>
-                              <goal>verify</goal>
-                            </goals>
-                          </execution>
+                            <execution>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
                         </executions>
                         <configuration>
-                          <skipITs>false</skipITs>
-                          <environmentVariables>
-                            <ODLSLI_PORT>${odlsli.port}</ODLSLI_PORT>
-                          </environmentVariables>
+                            <skipITs>false</skipITs>
+                            <environmentVariables>
+                                <ODLSLI_PORT>${odlsli.port}</ODLSLI_PORT>
+                            </environmentVariables>
                         </configuration>
-                      </plugin>
+                    </plugin>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.28.0</version>
+                        <version>0.34.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -603,21 +588,24 @@
                                     <name>${image.name}</name>
                                     <build>
                                         <cleanup>try</cleanup>
-                                        <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                                        <noCache>true</noCache>
+                                        <contextDir>${basedir}/target/docker-stage</contextDir>
                                         <dockerFile>Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.docker.latestminortag.version}</tag>
-                                            <tag>${project.docker.latestfulltag.version}</tag>
-                                            <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                            <tag>${project.docker.uniquedockertag.version}</tag>
-				    </tags>
+                                            <tag>${project.docker.latestminortag.snapshot.version}</tag>
+                                            <tag>${project.docker.latestfulltag.snapshot.version}</tag>
+                                            <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag>
+                                        </tags>
                                     </build>
                                 </image>
                             </images>
+                            <verbose>${docker.verbose}</verbose>
+                            <skipRun>${docker.skip.run}</skipRun>
+                            <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>generate-images</id>
+                                <id>build-images</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>build</goal>
@@ -637,9 +625,12 @@
                                             <run>
                                                 <env>
                                                     <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
+                                                    <!-- Below are not required as installSdncDb.sh handles same -->
+                                                    <!--
                                                     <MYSQL_USER>sdnctl</MYSQL_USER>
                                                     <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
                                                     <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    -->
                                                 </env>
                                                 <network>
                                                     <mode>custom</mode>
@@ -657,14 +648,14 @@
                                             </run>
                                         </image>
                                         <image>
-                                            <name>${image.name}:${project.docker.latesttagtimestamp.version}</name>
+                                            <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name>
                                             <alias>odlsli-container</alias>
                                             <run>
                                                 <env>
                                                     <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
-                                                    <MYSQL_USER>sdnctl</MYSQL_USER>
-                                                    <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
-                                                    <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
+                                                    <SDNC_DB_USER>sdnctl</SDNC_DB_USER>
+                                                    <SDNC_DB_PASSWORD>gamma</SDNC_DB_PASSWORD>
+                                                    <SDNC_DB_DATABASE>sdnctl</SDNC_DB_DATABASE>
                                                     <SDNC_CONFIG_DIR>/opt/onap/ccsdk/data/properties</SDNC_CONFIG_DIR>
                                                     <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
                                                 </env>
@@ -675,13 +666,13 @@
                                                     <mode>custom</mode>
                                                     <name>onap</name>
                                                     <alias>odlsli</alias>
-                                                </network>&gt;
+                                                </network>
                                                 <ports>
                                                     <port>odlsli.port:8181</port>
                                                 </ports>
                                                 <wait>
                                                     <log>all warp coils are now operating at peak efficiency</log>
-                                                    <time>120000</time>
+                                                    <time>300000</time>
                                                 </wait>
                                                 <log>
                                                     <enabled>true</enabled>
@@ -700,9 +691,8 @@
                             </execution>
                             <execution>
                                 <id>push-images</id>
-                                <phase>${docker.push.phase}</phase>
                                 <goals>
-                                    <goal>build</goal>
+                                    <!--<goal>build</goal>-->
                                     <goal>push</goal>
                                 </goals>
                             </execution>