commit | d84f89ba3d18fb8e9c44fa0bab004d24c56b0a81 | [log] [tgz] |
---|---|---|
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 [diff] |
[WIP] Upgrade ONOS to karaf version 4.2.1 Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/protocols/pcep/server/api/src/test/java/org/onosproject/pcep/server/PcepClientControllerAdapter.java b/protocols/pcep/server/api/src/test/java/org/onosproject/pcep/server/PcepClientControllerAdapter.java index 80e6561..b5e448e 100644 --- a/protocols/pcep/server/api/src/test/java/org/onosproject/pcep/server/PcepClientControllerAdapter.java +++ b/protocols/pcep/server/api/src/test/java/org/onosproject/pcep/server/PcepClientControllerAdapter.java
@@ -17,8 +17,8 @@ import com.google.common.collect.Sets; -import org.apache.felix.scr.annotations.Activate; -import org.apache.felix.scr.annotations.Deactivate; +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Deactivate; import org.onlab.packet.IpAddress; import org.onosproject.incubator.net.tunnel.DefaultLabelStack; import org.onosproject.incubator.net.tunnel.LabelStack;