commit d84f89ba3d18fb8e9c44fa0bab004d24c56b0a81
author Ray Milkey <ray@opennetworking.org> Fri Aug 17 14:54:17 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Fri Sep 28 11:20:57 2018 -0700
tree 687aacc51f41941321d07f3a4ded68b68d7d813d
parent 10216e4129e46816826c7288287230d3236de03a

[WIP] Upgrade ONOS to karaf version 4.2.1

Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa

apps/gluon/src/main/java/org/onosproject/gluon/manager/GluonManager.java

diff --git a/apps/gluon/src/main/java/org/onosproject/gluon/manager/GluonManager.java b/apps/gluon/src/main/java/org/onosproject/gluon/manager/GluonManager.java
index c0a4b67..1d8b32a 100644
--- a/apps/gluon/src/main/java/org/onosproject/gluon/manager/GluonManager.java
+++ b/apps/gluon/src/main/java/org/onosproject/gluon/manager/GluonManager.java
@@ -15,11 +15,11 @@
  */
 package org.onosproject.gluon.manager;
 
-import org.apache.felix.scr.annotations.Activate;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.onosproject.core.CoreService;
 import org.onosproject.gluon.rsc.GluonConfig;
 import org.onosproject.gluon.rsc.GluonServer;
@@ -41,10 +41,10 @@
     private final Logger log = LoggerFactory.getLogger(getClass());
     private static final String APP_ID = "org.onosproject.gluon";
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected CoreService coreService;
 
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected NetworkConfigRegistry configRegistry;