Compile against Carbon

Update sli/core to compile against OpenDaylight Carbon SR1

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

6 files changed, 14 insertions, 8 deletions

diff --git a/sliapi/features/pom.xml b/sliapi/features/pom.xml
index 1fc0f61be..63fd51a4e 100755
--- a/sliapi/features/pom.xml
+++ b/sliapi/features/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.onap.ccsdk.sli.core</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-features</artifactId>
 
diff --git a/sliapi/installer/pom.xml b/sliapi/installer/pom.xml
index 36570cded..b3939a6bc 100755
--- a/sliapi/installer/pom.xml
+++ b/sliapi/installer/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.onap.ccsdk.sli.core</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-installer</artifactId>
 	<packaging>pom</packaging>
diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
index 17bee5a99..b6dcfe8bd 100755
--- a/sliapi/model/pom.xml
+++ b/sliapi/model/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.onap.ccsdk.sli.core</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-model</artifactId>
 	<packaging>bundle</packaging>
@@ -43,7 +43,10 @@
 							<yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
 							<codeGenerators>
 								<generator>
+									<!--
 									<codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+									-->
+									<codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
 									<outputBaseDir>${salGeneratorPath}</outputBaseDir>
 								</generator>
 							</codeGenerators>
diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index 1ca872e1f..6837cc04e 100755
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.sli.core</groupId>
 		<artifactId>sdnc-core</artifactId>
-        	<version>0.0.1-SNAPSHOT</version>
+        	<version>0.1.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>
 	<groupId>org.onap.ccsdk.sli.core</groupId>
 	<artifactId>sliapi</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.1.0-SNAPSHOT</version>
 
 	<properties>
 		<feature-name>sliapi</feature-name>
diff --git a/sliapi/provider/pom.xml b/sliapi/provider/pom.xml
index d5f491771..9afbdc5fe 100755
--- a/sliapi/provider/pom.xml
+++ b/sliapi/provider/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>sliapi</artifactId>
 		<groupId>org.onap.ccsdk.sli.core</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>sliapi-provider</artifactId>
 	<packaging>bundle</packaging>
@@ -42,7 +42,10 @@
 									</additionalConfiguration>
 								</generator>
 								<generator>
+									<!--
 									<codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+									-->
+									<codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
 									<outputBaseDir>${salGeneratorPath}</outputBaseDir>
 								</generator>
 							</codeGenerators>
diff --git a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java b/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java
index 36e401144..2894ba75a 100644
--- a/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java
+++ b/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProvider.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.