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] [blame] |
[WIP] Upgrade ONOS to karaf version 4.2.1 Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/models/microsemi/src/main/java/org/onosproject/models/microsemi/MicrosemiModelRegistrator.java b/models/microsemi/src/main/java/org/onosproject/models/microsemi/MicrosemiModelRegistrator.java index 3c6a6c6..bb1b7de 100644 --- a/models/microsemi/src/main/java/org/onosproject/models/microsemi/MicrosemiModelRegistrator.java +++ b/models/microsemi/src/main/java/org/onosproject/models/microsemi/MicrosemiModelRegistrator.java
@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableMap; import org.onosproject.yang.AbstractYangModelRegistrator; import org.onosproject.yang.gen.v1.ietfsystemmicrosemi.rev20160505.IetfSystemMicrosemi; -import org.apache.felix.scr.annotations.Component; +import org.osgi.service.component.annotations.Component; import org.onosproject.yang.gen.v1.mseacfm.rev20160229.MseaCfm; import org.onosproject.yang.gen.v1.mseasoampm.rev20160229.MseaSoamPm; import org.onosproject.yang.gen.v1.mseasoamfm.rev20160229.MseaSoamFm;