From 784e3ef65f03017ea82055dcedab73a5b04e4972 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Mon, 18 Jun 2018 17:11:56 -0400
Subject: Update sli/core/utils version

Update sli/core/utils features versions to ODL Oxygen

Change-Id: Icef6bd776bf489b3991dc2406bccfea4104b1299
Issue-ID: CCSDK-280
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 .../installer/src/main/resources/scripts/install-feature.sh   |  2 +-
 utils/features/sdnc-slicore-utils/pom.xml                     | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh b/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
index 74b95b5c..638c7339 100644
--- a/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
+++ b/sliPluginUtils/installer/src/main/resources/scripts/install-feature.sh
@@ -29,7 +29,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
 
 if [ -f ${REPOZIP} ]
 then
-	unzip -d ${ODL_HOME} ${REPOZIP}
+	unzip -nd ${ODL_HOME} ${REPOZIP}
 else
 	echo "ERROR : repo zip ($REPOZIP) not found"
 	exit 1
diff --git a/utils/features/sdnc-slicore-utils/pom.xml b/utils/features/sdnc-slicore-utils/pom.xml
index 8ff1d4cf..952e4ab1 100644
--- a/utils/features/sdnc-slicore-utils/pom.xml
+++ b/utils/features/sdnc-slicore-utils/pom.xml
@@ -21,26 +21,21 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal.model</groupId>
                 <artifactId>mdsal-model-artifacts</artifactId>
-                <version>0.11.1</version>
+                <version>${odl.mdsal.model.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>1.6.1</version>
+                <version>${odl.mdsal.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-broker</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
+
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-- 
cgit 1.2.3-korg