From: Dan Timoney <dt5972@att.com>
Date: Tue, 10 Apr 2018 16:58:51 +0000 (+0000)
Subject: Merge "Install directed graphs"
X-Git-Tag: v0.2.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=d200fedd1fa5513574aec2d0ee9b0d4dbc6f7cff;hp=-c

Merge "Install directed graphs"
---

d200fedd1fa5513574aec2d0ee9b0d4dbc6f7cff
diff --combined odlsli/pom.xml
index 93f9c4fe,8edfebb2..932a903a
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@@ -25,7 -25,7 +25,7 @@@
          <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>yyMMdd-HHmmss</maven.build.timestamp.format>
 +        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
      </properties>
  
      <dependencies>
@@@ -309,6 -309,24 +309,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>
@@@ -317,28 -335,6 +335,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>