X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=odlsli%2Fpom.xml;h=7a63ca23abaecfd5c281f6071fff2ed07275bb91;hb=6f0c0101dcb421c75a1a49bea02d1dc7479ef7d1;hp=a16ae84097e7e6ca9044f7d5eff150a7cf3d6c2a;hpb=e232baec10e9c5dbae446398f6a702befcbf0c0d;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index a16ae840..7a63ca23 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -6,12 +6,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
+    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli</name>
@@ -24,6 +25,8 @@
         <image.name>onap/ccsdk-odlsli-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+	<docker.push.phase>deploy</docker.push.phase>
     </properties>
 
     <dependencies>
@@ -307,6 +310,24 @@
                             <excludeTransitive>true</excludeTransitive>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unpack dgs</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                        <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>platform-logic-installer</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -315,28 +336,6 @@
                 <version>1.5.0</version>
                 <executions>
 
-<!--                     <execution>
-                        <id>Get features</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>/bin/bash</executable>
-                            <environmentVariables>
-                                <SDNC_CORE_VERSION>${ccsdk.sli.core.version}</SDNC_CORE_VERSION>
-                                <SDNC_ADAPTORS_VERSION>${ccsdk.sli.adaptors.version}</SDNC_ADAPTORS_VERSION>
-                                <SDNC_NORTHBOUND_VERSION>${ccsdk.sli.northbound.version}</SDNC_NORTHBOUND_VERSION>
-                                <SDNC_PLUGINS_VERSION>${ccsdk.sli.plugins.version}</SDNC_PLUGINS_VERSION>
-                                <SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
-                            </environmentVariables>
-                            <arguments>
-                                <argument>${basedir}/src/main/scripts/installZips.sh</argument>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                            </arguments>
-                        </configuration>
-                    </execution> -->
-
                     <execution>
                         <id>change shell permissions</id>
                         <phase>process-sources</phase>
@@ -402,7 +401,7 @@
 
                             <execution>
                                 <id>push-images</id>
-                                <phase>deploy</phase>
+                                <phase>${docker.push.phase}</phase>
                                 <goals>
                                     <goal>build</goal>
                                     <goal>push</goal>