From 56c27daf1656fd6436f8c818c771cf803079e1ea Mon Sep 17 00:00:00 2001
From: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Date: Mon, 18 Jan 2021 05:41:16 +0100
Subject: migrate sli to alu-SR1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

migrate ODL interfaces and fix code for changes in alu-SR1

Issue-ID: CCSDK-3089
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Id48dcfc517585f2ce6b30047113cd1d173c3c9dc
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
---
 adaptors/aai-service/provider/pom.xml              |  4 +++
 .../OSGI-INF/blueprint/aaiservice-blueprint.xml    | 39 ----------------------
 2 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100755 adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml

(limited to 'adaptors/aai-service/provider')

diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml
index 11d04b1fe..fe963fd85 100755
--- a/adaptors/aai-service/provider/pom.xml
+++ b/adaptors/aai-service/provider/pom.xml
@@ -100,6 +100,10 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId> 
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml b/adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml
deleted file mode 100755
index 970936610..000000000
--- a/adaptors/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 - 2018 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.
-  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.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
-           xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
-           odl:use-default-for-reference-types="true">
-
-    <bean id="provider" class="org.onap.ccsdk.sli.adaptors.aai.AAIServiceProvider" />
-
-    <bean id="aaiService" class="org.onap.ccsdk.sli.adaptors.aai.AAIService">
-        <argument ref="provider" />
-    </bean>
-    <service ref="aaiService">
-        <interfaces>
-            <value>org.onap.ccsdk.sli.adaptors.aai.AAIService</value>
-            <value>org.onap.ccsdk.sli.adaptors.aai.AAIClient</value>
-        </interfaces>
-    </service>
-
-</blueprint>
-- 
cgit 1.2.3-korg