Update ccsdk/distribution for Sodium

Updated dgbuilder/pom.xml to address breaking change in antrun maven
plugin.

Change-Id: Iff7b4f73caa7528d0cc5504a1d9efd4ac62142ea
Issue-ID: CCSDK-2564
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml
index 5edc91c..241e123 100644 (file)
--- a/dgbuilder/pom.xml
+++ b/dgbuilder/pom.xml
@@ -118,11 +118,11 @@
                                        <execution>
                                        <phase>generate-sources</phase>
                                        <configuration>
-                                       <tasks>
+                                       <target>
                                                <exec executable="${project.basedir}/build_pom_for_yang_compile">
                                                        <!--<arg value="${odlparent-carbon-sr1-version}"/>-->
                                                </exec>
-                                       </tasks>
+                                       </target>
                                        </configuration>
                                        <goals>
                                                <goal>run</goal>

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index a7ec8cd..20cd4ad 100644 (file)
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -21,7 +21,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-neon-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-sodium-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>

diff --git a/odlsli/src/main/resources/idmlight.db.mv.db b/odlsli/src/main/resources/idmlight.db.mv.db
index c0b7b49..f800990 100644 (file)
Binary files a/odlsli/src/main/resources/idmlight.db.mv.db and b/odlsli/src/main/resources/idmlight.db.mv.db differ