From f183aacc6611ead2341821d5c15c013dc3f52069 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 11 Mar 2022 14:50:20 +0100
Subject: [PATCH] Do not use blueprint-maven-plugin in device-ownership-service

Inline the generated container and dist dependencies on annotations
and the plugin.

Change-Id: I67d67aac7327bea03892f1da996af74d2e5a7b7d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 applications/device-ownership-service/pom.xml     | 15 ---------------
 .../impl/DeviceOwnershipServiceImpl.java          |  5 +----
 .../resources/OSGI-INF/blueprint/autowire.xml     |  8 ++++++++
 3 files changed, 9 insertions(+), 19 deletions(-)
 create mode 100644 applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml

diff --git a/applications/device-ownership-service/pom.xml b/applications/device-ownership-service/pom.xml
index 0534c26d85..efcee31376 100644
--- a/applications/device-ownership-service/pom.xml
+++ b/applications/device-ownership-service/pom.xml
@@ -27,20 +27,5 @@
             <artifactId>javax.annotation-api</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>blueprint-maven-plugin-annotation</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.aries.blueprint</groupId>
-                <artifactId>blueprint-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/applications/device-ownership-service/src/main/java/org/opendaylight/openflowplugin/applications/deviceownershipservice/impl/DeviceOwnershipServiceImpl.java b/applications/device-ownership-service/src/main/java/org/opendaylight/openflowplugin/applications/deviceownershipservice/impl/DeviceOwnershipServiceImpl.java
index fcde562080..6ac688df46 100644
--- a/applications/device-ownership-service/src/main/java/org/opendaylight/openflowplugin/applications/deviceownershipservice/impl/DeviceOwnershipServiceImpl.java
+++ b/applications/device-ownership-service/src/main/java/org/opendaylight/openflowplugin/applications/deviceownershipservice/impl/DeviceOwnershipServiceImpl.java
@@ -15,8 +15,6 @@ import java.util.regex.Pattern;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import javax.inject.Singleton;
-import org.apache.aries.blueprint.annotation.service.Reference;
-import org.apache.aries.blueprint.annotation.service.Service;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipChange;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
@@ -27,7 +25,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-@Service(classes = DeviceOwnershipService.class)
 public class DeviceOwnershipServiceImpl implements DeviceOwnershipService, EntityOwnershipListener {
     private static final Logger LOG = LoggerFactory.getLogger(DeviceOwnershipServiceImpl.class);
     private static final String SERVICE_ENTITY_TYPE = "org.opendaylight.mdsal.ServiceEntityType";
@@ -36,7 +33,7 @@ public class DeviceOwnershipServiceImpl implements DeviceOwnershipService, Entit
     private final EntityOwnershipService eos;
     private final ConcurrentMap<String, EntityOwnershipState> ownershipStateCache = new ConcurrentHashMap<>();
 
-    public DeviceOwnershipServiceImpl(@Reference final EntityOwnershipService entityOwnershipService) {
+    public DeviceOwnershipServiceImpl(final EntityOwnershipService entityOwnershipService) {
         this.eos = entityOwnershipService;
     }
 
diff --git a/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml b/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml
new file mode 100644
index 0000000000..b0d7acd308
--- /dev/null
+++ b/applications/device-ownership-service/src/main/resources/OSGI-INF/blueprint/autowire.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    <bean id="deviceOwnershipServiceImpl" class="org.opendaylight.openflowplugin.applications.deviceownershipservice.impl.DeviceOwnershipServiceImpl" init-method="start" destroy-method="close">
+        <argument ref="entityOwnershipService"/>
+    </bean>
+    <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
+    <service ref="deviceOwnershipServiceImpl" interface="org.opendaylight.openflowplugin.applications.deviceownershipservice.DeviceOwnershipService"/>
+</blueprint>
-- 
2.36.6