X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fpom.xml;h=932a903ad84359c5d25a20206953b571b5fe407b;hp=ba9fc2651a335f379885ea0d4f9692b2f11951ea;hb=d200fedd1fa5513574aec2d0ee9b0d4dbc6f7cff;hpb=f77561cb74548f172ebfb4bf4cdae17fa103eb63

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index ba9fc265..932a903a 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -1,26 +1,120 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-root</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
+    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>Distribution - odlsli</name>
+    <name>ccsdk-distribution :: odlsli</name>
     <description>Creates SDN Controller Docker container</description>
+    <organization>
+        <name>openECOMP</name>
+    </organization>
 
     <properties>
         <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>
     </properties>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>dblib-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>filters-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliapi-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sliPluginUtils-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>utils-installer</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>aai-service-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>mdsal-resource-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>resource-assignment-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.adaptors</groupId>
+            <artifactId>sql-resource-installer</artifactId>
+            <version>${ccsdk.sli.adaptors.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>asdcApi-installer</artifactId>
+            <version>${ccsdk.sli.northbound.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>dataChange-installer</artifactId>
+            <version>${ccsdk.sli.northbound.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>properties-node-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>restapi-call-node-installer</artifactId>
+            <version>${ccsdk.sli.plugins.version}</version>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -39,19 +133,17 @@
                             <source>
                                 println project.properties['ccsdk.project.version'];
                                 def versionArray;
-                                if ( project.properties['ccsdk.project.version'] != null ) {
+                                if (project.properties['ccsdk.project.version'] != null ) {
                                     versionArray = project.properties['ccsdk.project.version'].split('\\.');
                                 }
 
-                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
-                                {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0]  + '.' + versionArray[1] + "-STAGING-latest";
+                                if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT")) {
+                                    project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                 } else {
                                     project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                 }
 
-                                println 'New Tag for docker:' +
-                                project.properties['project.docker.latesttag.version'];
+                                println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
                             </source>
                         </configuration>
                     </execution>
@@ -91,7 +183,7 @@
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/scripts</directory>
@@ -149,7 +241,7 @@
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/resources</directory>
@@ -168,7 +260,7 @@
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/properties</directory>
@@ -187,7 +279,7 @@
                         </goals><!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/stores</directory>
@@ -202,32 +294,46 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
-                <groupId>org.codehaus.mojo</groupId>
-                <version>1.5.0</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.0.2</version>
                 <executions>
-
                     <execution>
-                        <id>Get features</id>
+                        <id>unpack features</id>
                         <phase>generate-sources</phase>
                         <goals>
-                            <goal>exec</goal>
+                        <goal>unpack-dependencies</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/sdnc</argument>
-                            </arguments>
+                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/features</outputDirectory>
+                            <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>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <executions>
 
                     <execution>
                         <id>change shell permissions</id>
@@ -238,7 +344,7 @@
                         <configuration>
                             <executable>/usr/bin/find</executable>
                             <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
+                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
                                 <argument>-name</argument>
                                 <argument>*.sh</argument>
                                 <argument>-exec</argument>
@@ -254,7 +360,6 @@
 
 
         </plugins>
-
     </build>
 
     <profiles>
@@ -307,7 +412,4 @@
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>openECOMP</name>
-    </organization>
 </project>