Port sli/plugins to Carbon

Updated sli/plugins to compile against OpenDaylight Carbon SR1

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

11 files changed, 21 insertions, 21 deletions

diff --git a/properties-node/features/pom.xml b/properties-node/features/pom.xml
index 159ac4740..d23d9979c 100755
--- a/properties-node/features/pom.xml
+++ b/properties-node/features/pom.xml
@@ -4,10 +4,10 @@
 	<parent>

 		<artifactId>properties-node</artifactId>

 		<groupId>org.onap.ccsdk.sli.plugins</groupId>

-		<version>0.0.1-SNAPSHOT</version>

+		<version>0.1.0-SNAPSHOT</version>

 	</parent>

 	<groupId>org.onap.ccsdk.sli.plugins</groupId>

-	<version>0.0.1-SNAPSHOT</version>

+	<version>0.1.0-SNAPSHOT</version>

 	<artifactId>properties-node-features</artifactId>

 	<name>Properties Node - Features</name>

 

diff --git a/properties-node/features/src/main/resources/features.xml b/properties-node/features/src/main/resources/features.xml
index 2ed98a124..5f0d7b55d 100644
--- a/properties-node/features/src/main/resources/features.xml
+++ b/properties-node/features/src/main/resources/features.xml
@@ -3,8 +3,8 @@
   ============LICENSE_START=======================================================
   openECOMP : SDN-C
   ================================================================================
-  Copyright (C) 2017 ONAP Intellectual Property. All rights
-  						reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  			reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml
index 5749a9b99..7e6ae1740 100755
--- a/properties-node/installer/pom.xml
+++ b/properties-node/installer/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>properties-node</artifactId>
 		<groupId>org.onap.ccsdk.sli.plugins</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>properties-node-installer</artifactId>
 	<name>Properties node - Karaf  Installer</name>
diff --git a/properties-node/installer/src/assembly/assemble_installer_zip.xml b/properties-node/installer/src/assembly/assemble_installer_zip.xml
index e278872a1..3bed4b5ef 100644
--- a/properties-node/installer/src/assembly/assemble_installer_zip.xml
+++ b/properties-node/installer/src/assembly/assemble_installer_zip.xml
@@ -2,8 +2,8 @@
   ============LICENSE_START=======================================================
   openECOMP : SDN-C
   ================================================================================
-  Copyright (C) 2017 ONAP Intellectual Property. All rights
-  						reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  			reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
index 1edacdb6d..cb56f2cd4 100644
--- a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -2,8 +2,8 @@
   ============LICENSE_START=======================================================
   openECOMP : SDN-C
   ================================================================================
-  Copyright (C) 2017 ONAP Intellectual Property. All rights
-  						reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  			reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/properties-node/installer/src/main/resources/scripts/install-feature.sh b/properties-node/installer/src/main/resources/scripts/install-feature.sh
index 9a47d2225..e986764b9 100644
--- a/properties-node/installer/src/main/resources/scripts/install-feature.sh
+++ b/properties-node/installer/src/main/resources/scripts/install-feature.sh
@@ -4,8 +4,8 @@
 # ============LICENSE_START=======================================================
 # openECOMP : SDN-C
 # ================================================================================
-# Copyright (C) 2017 ONAP Intellectual Property. All rights
-# 						reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 			reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/properties-node/pom.xml b/properties-node/pom.xml
index 8d6af7c57..44d89f924 100755
--- a/properties-node/pom.xml
+++ b/properties-node/pom.xml
@@ -3,7 +3,7 @@
 	<parent>

 		<groupId>org.onap.ccsdk.sli.plugins</groupId>

 		<artifactId>sdnc-plugins</artifactId>

-		<version>0.0.1-SNAPSHOT</version>

+		<version>0.1.0-SNAPSHOT</version>

 	</parent>

 

 	<modelVersion>4.0.0</modelVersion>

@@ -11,7 +11,7 @@
 

 	<groupId>org.onap.ccsdk.sli.plugins</groupId>

 	<artifactId>properties-node</artifactId>

-	<version>0.0.1-SNAPSHOT</version>

+	<version>0.1.0-SNAPSHOT</version>

 

 	<name>Properties Node</name>

 	<description>This is an implementation of DG Execute Node that reads property file and

diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml
index 43369adf7..1c5eff74c 100755
--- a/properties-node/provider/pom.xml
+++ b/properties-node/provider/pom.xml
@@ -4,10 +4,10 @@
 	<parent>

 		<groupId>org.onap.ccsdk.sli.plugins</groupId>

 		<artifactId>properties-node</artifactId>

-		<version>0.0.1-SNAPSHOT</version>

+		<version>0.1.0-SNAPSHOT</version>

 	</parent>

 	<groupId>org.onap.ccsdk.sli.plugins</groupId>

-	<version>0.0.1-SNAPSHOT</version>

+	<version>0.1.0-SNAPSHOT</version>

 	<artifactId>properties-node-provider</artifactId>

 	<packaging>bundle</packaging>

 	<name>Properties Node - Provider</name>

diff --git a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
index aa5663066..165b706be 100644
--- a/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
+++ b/properties-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/prop/PropertiesNode.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * openECOMP : SDN-C
  * ================================================================================
- * Copyright (C) 2017 ONAP Intellectual Property. All rights
- * 						reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 			reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
index 048acc4aa..fd7ace8a5 100644
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
+++ b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-context.xml
@@ -3,8 +3,8 @@
   ============LICENSE_START=======================================================
   openECOMP : SDN-C
   ================================================================================
-  Copyright (C) 2017 ONAP Intellectual Property. All rights
-  						reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  			reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
index ce17a4611..19275fc9d 100644
--- a/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
+++ b/properties-node/provider/src/main/resources/META-INF/spring/properties-node-osgi-context.xml
@@ -3,8 +3,8 @@
   ============LICENSE_START=======================================================
   openECOMP : SDN-C
   ================================================================================
-  Copyright (C) 2017 ONAP Intellectual Property. All rights
-  						reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights
+  			reserved.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.