From b5dfc03248533fb70c9989ac378d94b88934e399 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Wed, 15 Aug 2018 11:22:55 -0400
Subject: Update sli/core for Oxygen SR3

Removed version for yangtools dependency in sliapi so that it is
controlled by parent pom to resolve issue caused in Oxygen SR3 upgrade
due to hard-coded SR1 version.  Also, updated name of utils features
directory to match name of artifact (sdnc-slicore-utils renamed to
ccsdk-slicore-utils).

Change-Id: I32b3822e4ae0fdd4c07d5912e4674b19c8615d54
Issue-ID: CCSDK-453
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 .gitignore                                 |  2 +-
 sliapi/provider/pom.xml                    |  8 -----
 utils/features/ccsdk-slicore-utils/pom.xml | 47 ++++++++++++++++++++++++++++++
 utils/features/pom.xml                     |  2 +-
 utils/features/sdnc-slicore-utils/pom.xml  | 47 ------------------------------
 5 files changed, 49 insertions(+), 57 deletions(-)
 create mode 100644 utils/features/ccsdk-slicore-utils/pom.xml
 delete mode 100644 utils/features/sdnc-slicore-utils/pom.xml

diff --git a/.gitignore b/.gitignore
index a5a0d80e..b45dfca4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,7 @@ ExprGrammar.tokens
 ExprGrammarLexer.tokens
 
 # BlackDuck generated file
-sdnc-core_bdio.jsonld
+*.jsonld
 blackDuckHubProjectName.txt
 blackDuckHubProjectVersionName.txt
 
diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index 994557a5..bcd58532 100755
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -29,47 +29,39 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-config</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
 
 
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
-            <version>2.0.3</version>
         </dependency>
 
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/utils/features/ccsdk-slicore-utils/pom.xml b/utils/features/ccsdk-slicore-utils/pom.xml
new file mode 100644
index 00000000..952e4ab1
--- /dev/null
+++ b/utils/features/ccsdk-slicore-utils/pom.xml
@@ -0,0 +1,47 @@
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.1.0-SNAPSHOT</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.core</groupId>
+    <artifactId>ccsdk-slicore-utils</artifactId>
+    <version>0.3.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${odl.mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <dependencies>
+
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>utils-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/utils/features/pom.xml b/utils/features/pom.xml
index 4f3be1b8..bac928ab 100755
--- a/utils/features/pom.xml
+++ b/utils/features/pom.xml
@@ -17,6 +17,6 @@
 
     <modules>
         <module>features-util</module>
-        <module>sdnc-slicore-utils</module>
+        <module>ccsdk-slicore-utils</module>
     </modules>
 </project>
diff --git a/utils/features/sdnc-slicore-utils/pom.xml b/utils/features/sdnc-slicore-utils/pom.xml
deleted file mode 100644
index 952e4ab1..00000000
--- a/utils/features/sdnc-slicore-utils/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.sli.core</groupId>
-    <artifactId>ccsdk-slicore-utils</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${odl.mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-    <dependencies>
-
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>utils-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-    </dependencies>
-</project>
-- 
cgit 1.2.3-korg