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>

diff --git a/.gitignore b/.gitignore
index a5a0d80..b45dfca 100755 (executable)
--- 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 994557a..bcd5853 100755 (executable)
--- 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/sdnc-slicore-utils/pom.xml b/utils/features/ccsdk-slicore-utils/pom.xml
similarity index 100%
rename from utils/features/sdnc-slicore-utils/pom.xml
rename to utils/features/ccsdk-slicore-utils/pom.xml

diff --git a/utils/features/pom.xml b/utils/features/pom.xml
index 4f3be1b..bac928a 100755 (executable)
--- 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>