From 1027b0c07b488bb5f4542bd38501f9a99da5c2cf Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 15 Aug 2017 15:18:54 -0400
Subject: Port sli/northbound to Carbon

Updated sli/northbound repo to compile against OpenDaylight Carbon SR1 release

Change-Id: I6aec68cf436e11f5fd5b7094eb5616536bead44f
Issue-ID: CCSDK-25
Signed-off-by: Dan Timoney <dtimoney@att.com>
---
 asdcApi/installer/pom.xml                                       | 5 ++---
 asdcApi/installer/src/assembly/assemble_installer_zip.xml       | 4 ++--
 asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml         | 4 ++--
 asdcApi/installer/src/main/resources/scripts/install-feature.sh | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'asdcApi/installer')

diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index b4f32934a..32f505053 100755
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/installer/pom.xml
@@ -1,11 +1,10 @@
 <?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">
+<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>
 		<artifactId>asdcApi</artifactId>
 		<groupId>org.onap.ccsdk.sli.northbound</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>asdcApi-installer</artifactId>
 	<name>asdcApi  - Karaf  Installer</name>
diff --git a/asdcApi/installer/src/assembly/assemble_installer_zip.xml b/asdcApi/installer/src/assembly/assemble_installer_zip.xml
index e278872a1..3bed4b5ef 100644
--- a/asdcApi/installer/src/assembly/assemble_installer_zip.xml
+++ b/asdcApi/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/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml b/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
index 608200da1..5c24d73ff 100644
--- a/asdcApi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/asdcApi/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/asdcApi/installer/src/main/resources/scripts/install-feature.sh b/asdcApi/installer/src/main/resources/scripts/install-feature.sh
index 9a47d2225..e986764b9 100644
--- a/asdcApi/installer/src/main/resources/scripts/install-feature.sh
+++ b/asdcApi/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.
-- 
cgit 1.2.3-korg