X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=odlsli%2Fpom.xml;h=68865e9baac60d8afdbb252bf0c3b6f77c5eec53;hp=b176c9856ffe1ddfd3f8b23be4ea78e2fe2fad04;hb=912f98b9cdfe0f636239b8f94fccf7858bffac26;hpb=6741df81b766bb1dc271c214b923b18f52c20892

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index b176c985..68865e9b 100644
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -1,32 +1,29 @@
 <?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">
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.1.0-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+
     <artifactId>distribution-odlsli</artifactId>
-    <version>0.1.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>
-        <ccsdk.core.version>0.1.2-SNAPSHOT</ccsdk.core.version>
-        <ccsdk.adaptors.version>${project.version}</ccsdk.adaptors.version>
-        <ccsdk.northbound.version>${project.version}</ccsdk.northbound.version>
-        <ccsdk.plugins.version>${project.version}</ccsdk.plugins.version>
-        <ccsdk.mysql-connector-java.version>5.1.39</ccsdk.mysql-connector-java.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
     </properties>
 
-
     <build>
         <plugins>
 
@@ -128,6 +125,25 @@
                             </resources>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-config</id>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals><!-- here the phase you need -->
+                        <phase>validate</phase>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                    <includes>
+                                        <include>org.ops4j.pax.logging.cfg</include>
+                                    </includes>
+                                    <filtering>false</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>copy-data</id>
                         <goals>
@@ -176,7 +192,7 @@
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../src/main/stores</directory>
+                                    <directory>src/main/stores</directory>
                                     <includes>
                                         <include>*.jks</include>
                                     </includes>
@@ -188,8 +204,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
                 <version>1.5.0</version>
                 <executions>
 
@@ -202,10 +218,10 @@
                         <configuration>
                             <executable>/bin/bash</executable>
                             <environmentVariables>
-                                <SDNC_CORE_VERSION>${ccsdk.core.version}</SDNC_CORE_VERSION>
-                                <SDNC_ADAPTORS_VERSION>${ccsdk.adaptors.version}</SDNC_ADAPTORS_VERSION>
-                                <SDNC_NORTHBOUND_VERSION>${ccsdk.northbound.version}</SDNC_NORTHBOUND_VERSION>
-                                <SDNC_PLUGINS_VERSION>${ccsdk.plugins.version}</SDNC_PLUGINS_VERSION>
+                                <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>
@@ -240,7 +256,6 @@
 
 
         </plugins>
-
     </build>
 
     <profiles>
@@ -293,7 +308,4 @@
             </build>
         </profile>
     </profiles>
-    <organization>
-        <name>openECOMP</name>
-    </organization>
 </project>