From deaa88f7b81eabed78b6e43ebc04696326c3d670 Mon Sep 17 00:00:00 2001 From: Vishal Thapar Date: Mon, 24 Sep 2018 17:15:58 +0530 Subject: [PATCH 1/1] Genius Neon MRI changes Mockito & PowerMock bumps are deferred to "later". JIRA: GENIUS-210 Change-Id: Ia693f0f19a8304ef8754253fc2956638876c529d Signed-off-by: Michael Vorburger Signed-off-by: Vishal Thapar Signed-off-by: Robert Varga --- .gitignore | 1 + alivenessmonitor/alivenessmonitor-api/pom.xml | 8 +--- .../alivenessmonitor-impl-protocols/pom.xml | 7 ++++ .../AlivenessProtocolHandlerLLDP.java | 2 +- .../blueprint/alivenessmonitor-protocols.xml | 0 .../alivenessmonitor-impl/pom.xml | 4 +- .../blueprint/alivenessmonitor.xml | 0 alivenessmonitor/pom.xml | 2 +- arputil/arputil-api/pom.xml | 16 +++----- arputil/arputil-impl/pom.xml | 20 +++++----- .../blueprint/arputil.xml | 0 arputil/pom.xml | 2 +- artifacts/pom.xml | 2 +- commons/binding-parent/pom.xml | 9 +---- commons/checkstyle/pom.xml | 2 +- commons/pom.xml | 2 +- commons/quality-parent/pom.xml | 2 +- .../interfacemanager/InterfaceHelper.java | 4 +- .../InterfaceStateHelper.java | 2 +- .../fcapsapplication-impl/pom.xml | 4 +- .../blueprint/fcaps-app.xml | 0 fcapsapplication/pom.xml | 2 +- fcapsmanager/alarmmanager/pom.xml | 4 +- fcapsmanager/countermanager/pom.xml | 4 +- fcapsmanager/pom.xml | 2 +- features/genius-features/pom.xml | 2 +- features/odl-genius-api/pom.xml | 4 +- features/odl-genius-fcaps-application/pom.xml | 2 +- features/odl-genius-fcaps-framework/pom.xml | 2 +- features/odl-genius-rest/pom.xml | 2 +- features/odl-genius/pom.xml | 2 +- features/pom.xml | 2 +- idmanager/idmanager-impl/pom.xml | 10 +++-- .../genius/idmanager/IdManager.java | 4 +- .../blueprint/idmanager.xml | 0 .../ExpectedAllocateIdFromReleasedId.xtend | 3 +- ...cateIdMultipleRequestsFromReleaseIds.xtend | 4 +- .../test/ExpectedReleaseIdObjects.xtend | 4 +- .../idmanager/test/IdManagerTestModule.java | 4 +- .../blueprint/blueprint.xml | 0 idmanager/pom.xml | 2 +- interfacemanager/interfacemanager-api/pom.xml | 16 +++----- .../interfacemanager-impl/pom.xml | 12 +++--- .../genius/interfacemanager/IfmUtil.java | 4 +- .../InterfacemgrProvider.java | 4 +- .../commons/InterfaceManagerCommonUtils.java | 2 +- .../diagstatus/IfmDiagStatusProvider.java | 5 +-- .../InterfaceInventoryStateListener.java | 6 +-- .../listeners/InterfaceStateListener.java | 2 +- .../InterfaceManagerServiceImpl.java | 2 +- ...ractFlowBasedServicesConfigBindHelper.java | 4 +- ...ctFlowBasedServicesConfigUnbindHelper.java | 4 +- ...wBasedIngressServicesConfigBindHelper.java | 4 +- ...asedIngressServicesConfigUnbindHelper.java | 4 +- ...owBasedServicesInterfaceStateListener.java | 4 +- ...tractFlowBasedServicesStateBindHelper.java | 4 +- ...owBasedIngressServicesStateBindHelper.java | 4 +- .../blueprint/interfacemanager.xml | 0 .../InterfaceManagerConfigurationTest.java | 4 +- .../test/InterfaceManagerTestModule.java | 4 +- .../test/InterfaceManagerTestUtil.java | 4 +- .../xtend/ExpectedBoundServiceState.xtend | 2 +- .../test/xtend/ExpectedInterfaceConfig.xtend | 2 +- .../xtend/ExpectedInterfaceListFromDpn.xtend | 2 +- .../test/xtend/ExpectedInterfaceState.xtend | 2 +- .../test/xtend/ExpectedInterfaceType.xtend | 2 +- .../blueprint/blueprint.xml | 0 interfacemanager/pom.xml | 2 +- ipv6util/api/pom.xml | 12 ++---- ipv6util/impl/pom.xml | 4 +- .../blueprint/ipv6util.xml | 0 ipv6util/pom.xml | 2 +- itm/itm-api/pom.xml | 4 +- itm/itm-impl/pom.xml | 35 ++++++++++++++-- .../genius/itm/cache/TunnelStateCache.java | 4 +- .../ItmTunnelAggregationHelper.java | 2 +- .../itm/diagstatus/ItmDiagStatusProvider.java | 4 +- .../genius/itm/impl/ItmProvider.java | 4 +- .../genius/itm/impl/ItmUtils.java | 2 +- .../blueprint/itm.xml | 2 +- .../genius/itm/cli/TepCommandHelperTest.java | 2 +- .../genius/itm/tests/ItmTestModule.java | 4 +- itm/pom.xml | 2 +- karaf/pom.xml | 2 +- lockmanager/lockmanager-impl/pom.xml | 9 +++-- .../genius/lockmanager/impl/LockListener.java | 4 +- .../impl/LockManagerServiceImpl.java | 4 +- .../blueprint/lockmanager.xml | 0 lockmanager/pom.xml | 2 +- mdsalutil/mdsalutil-api/pom.xml | 4 +- .../clustering/EntityOwnershipUtils.java | 2 +- mdsalutil/mdsalutil-impl/pom.xml | 40 +++++++++++++++++-- .../DataTreeEventCallbackRegistrarImpl.java | 8 ++-- .../DatastoreServiceStatusProvider.java | 10 ++--- .../mdsalutil/internal/MDSALManager.java | 14 +++---- .../internal/UpgradeStateListener.java | 4 +- .../mdsalutil/internal/UpgradeUtils.java | 4 +- .../blueprint/mdsalutil.xml | 0 mdsalutil/mdsalutil-testutils/pom.xml | 4 +- .../testutils/DataBrokerFailuresModule.java | 3 +- mdsalutil/pom.xml | 2 +- pom.xml | 5 +-- resourcemanager/pom.xml | 2 +- resourcemanager/resourcemanager-impl/pom.xml | 4 +- .../blueprint/resourcemanager.xml | 0 105 files changed, 254 insertions(+), 209 deletions(-) rename alivenessmonitor/alivenessmonitor-impl-protocols/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/alivenessmonitor-protocols.xml (100%) rename alivenessmonitor/alivenessmonitor-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/alivenessmonitor.xml (100%) rename arputil/arputil-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/arputil.xml (100%) rename fcapsapplication/fcapsapplication-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/fcaps-app.xml (100%) rename idmanager/idmanager-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/idmanager.xml (100%) rename idmanager/idmanager-shell/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/blueprint.xml (100%) rename interfacemanager/interfacemanager-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/interfacemanager.xml (100%) rename interfacemanager/interfacemanager-shell/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/blueprint.xml (100%) rename ipv6util/impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/ipv6util.xml (100%) rename itm/itm-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/itm.xml (99%) rename lockmanager/lockmanager-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/lockmanager.xml (100%) rename mdsalutil/mdsalutil-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/mdsalutil.xml (100%) rename resourcemanager/resourcemanager-impl/src/main/resources/{org/opendaylight => OSGI-INF}/blueprint/resourcemanager.xml (100%) diff --git a/.gitignore b/.gitignore index 957e1af72..63afcd64f 100755 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ target target-ide .tox .DS_Store +.apt_generated_tests .checkstyle .fbExcludeFilterFile .factorypath diff --git a/alivenessmonitor/alivenessmonitor-api/pom.xml b/alivenessmonitor/alivenessmonitor-api/pom.xml index f1707fd60..5278126ac 100644 --- a/alivenessmonitor/alivenessmonitor-api/pom.xml +++ b/alivenessmonitor/alivenessmonitor-api/pom.xml @@ -40,12 +40,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml b/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml index c8efe8049..5e8fa2e4c 100644 --- a/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml +++ b/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml @@ -47,5 +47,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ipv6util-api ${project.version} + + + org.mockito + mockito-core + 1.10.19 + test + diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java index fb2925e9f..5ce0f3093 100644 --- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java +++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/internal/AlivenessProtocolHandlerLLDP.java @@ -35,7 +35,7 @@ import org.opendaylight.openflowplugin.libraries.liblldp.LLDP; import org.opendaylight.openflowplugin.libraries.liblldp.LLDPTLV; import org.opendaylight.openflowplugin.libraries.liblldp.LLDPTLV.TLVType; import org.opendaylight.openflowplugin.libraries.liblldp.PacketException; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.MonitorProtocolType; diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/resources/org/opendaylight/blueprint/alivenessmonitor-protocols.xml b/alivenessmonitor/alivenessmonitor-impl-protocols/src/main/resources/OSGI-INF/blueprint/alivenessmonitor-protocols.xml similarity index 100% rename from alivenessmonitor/alivenessmonitor-impl-protocols/src/main/resources/org/opendaylight/blueprint/alivenessmonitor-protocols.xml rename to alivenessmonitor/alivenessmonitor-impl-protocols/src/main/resources/OSGI-INF/blueprint/alivenessmonitor-protocols.xml diff --git a/alivenessmonitor/alivenessmonitor-impl/pom.xml b/alivenessmonitor/alivenessmonitor-impl/pom.xml index ff951b5ff..899da919b 100644 --- a/alivenessmonitor/alivenessmonitor-impl/pom.xml +++ b/alivenessmonitor/alivenessmonitor-impl/pom.xml @@ -78,8 +78,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html model-inventory - org.opendaylight.mdsal.model - ietf-interfaces + org.opendaylight.mdsal.binding.model.ietf + rfc7223 org.opendaylight.genius diff --git a/alivenessmonitor/alivenessmonitor-impl/src/main/resources/org/opendaylight/blueprint/alivenessmonitor.xml b/alivenessmonitor/alivenessmonitor-impl/src/main/resources/OSGI-INF/blueprint/alivenessmonitor.xml similarity index 100% rename from alivenessmonitor/alivenessmonitor-impl/src/main/resources/org/opendaylight/blueprint/alivenessmonitor.xml rename to alivenessmonitor/alivenessmonitor-impl/src/main/resources/OSGI-INF/blueprint/alivenessmonitor.xml diff --git a/alivenessmonitor/pom.xml b/alivenessmonitor/pom.xml index ca537c802..4a7b18fe6 100644 --- a/alivenessmonitor/pom.xml +++ b/alivenessmonitor/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/arputil/arputil-api/pom.xml b/arputil/arputil-api/pom.xml index 944a1d693..e07ba858f 100644 --- a/arputil/arputil-api/pom.xml +++ b/arputil/arputil-api/pom.xml @@ -49,20 +49,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html yang-ext - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 - org.opendaylight.mdsal.model - ietf-interfaces + org.opendaylight.mdsal.binding.model.ietf + rfc7223 - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 + org.opendaylight.mdsal.binding.model.iana + iana-if-type diff --git a/arputil/arputil-impl/pom.xml b/arputil/arputil-impl/pom.xml index bd67e861f..83bae61f7 100644 --- a/arputil/arputil-impl/pom.xml +++ b/arputil/arputil-impl/pom.xml @@ -58,20 +58,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html yang-ext - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 - org.opendaylight.mdsal.model - ietf-interfaces + org.opendaylight.mdsal.binding.model.ietf + rfc7223 - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 + org.opendaylight.mdsal.binding.model.iana + iana-if-type org.opendaylight.openflowplugin.model @@ -135,7 +131,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} --> + true true diff --git a/arputil/arputil-impl/src/main/resources/org/opendaylight/blueprint/arputil.xml b/arputil/arputil-impl/src/main/resources/OSGI-INF/blueprint/arputil.xml similarity index 100% rename from arputil/arputil-impl/src/main/resources/org/opendaylight/blueprint/arputil.xml rename to arputil/arputil-impl/src/main/resources/OSGI-INF/blueprint/arputil.xml diff --git a/arputil/pom.xml b/arputil/pom.xml index 58d9f292a..092cdd47b 100644 --- a/arputil/pom.xml +++ b/arputil/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index ad9857dd8..2082e8520 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index ecb02740a..64b230613 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.14.0-SNAPSHOT + 3.0.1 @@ -81,13 +81,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.codehaus.mojo findbugs-maven-plugin - - - jp.skypencil.findbugs.slf4j - bug-pattern - 1.4.0 - - true diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml index 9a4e71e54..389e41361 100644 --- a/commons/checkstyle/pom.xml +++ b/commons/checkstyle/pom.xml @@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 3.1.2 + 4.0.2 diff --git a/commons/pom.xml b/commons/pom.xml index e9cf5d2bd..0552b6f3a 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml index 772f40fea..e3b848a9a 100644 --- a/commons/quality-parent/pom.xml +++ b/commons/quality-parent/pom.xml @@ -44,7 +44,7 @@ org.opendaylight.mdsal mdsal-artifacts - 2.6.0-SNAPSHOT + 3.0.1 pom import diff --git a/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java b/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java index f2bdcea7a..713476940 100644 --- a/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java +++ b/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceHelper.java @@ -14,8 +14,8 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker; import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; diff --git a/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceStateHelper.java b/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceStateHelper.java index d2e16b34c..6ae8a346d 100644 --- a/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceStateHelper.java +++ b/commons/testutils/src/main/java/org/opendaylight/genius/testutils/interfacemanager/InterfaceStateHelper.java @@ -14,7 +14,7 @@ import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import org.opendaylight.genius.interfacemanager.globals.InterfaceInfo; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Other; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Other; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.AdminStatus; diff --git a/fcapsapplication/fcapsapplication-impl/pom.xml b/fcapsapplication/fcapsapplication-impl/pom.xml index 967dc060b..8f2c9099f 100644 --- a/fcapsapplication/fcapsapplication-impl/pom.xml +++ b/fcapsapplication/fcapsapplication-impl/pom.xml @@ -90,7 +90,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/fcapsapplication/fcapsapplication-impl/src/main/resources/org/opendaylight/blueprint/fcaps-app.xml b/fcapsapplication/fcapsapplication-impl/src/main/resources/OSGI-INF/blueprint/fcaps-app.xml similarity index 100% rename from fcapsapplication/fcapsapplication-impl/src/main/resources/org/opendaylight/blueprint/fcaps-app.xml rename to fcapsapplication/fcapsapplication-impl/src/main/resources/OSGI-INF/blueprint/fcaps-app.xml diff --git a/fcapsapplication/pom.xml b/fcapsapplication/pom.xml index b935b9938..f7c4f6352 100644 --- a/fcapsapplication/pom.xml +++ b/fcapsapplication/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/fcapsmanager/alarmmanager/pom.xml b/fcapsmanager/alarmmanager/pom.xml index 99ad251b8..c2d08221a 100644 --- a/fcapsmanager/alarmmanager/pom.xml +++ b/fcapsmanager/alarmmanager/pom.xml @@ -55,7 +55,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/fcapsmanager/countermanager/pom.xml b/fcapsmanager/countermanager/pom.xml index 1a47a1f6f..dcf8b2ff0 100644 --- a/fcapsmanager/countermanager/pom.xml +++ b/fcapsmanager/countermanager/pom.xml @@ -69,7 +69,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/fcapsmanager/pom.xml b/fcapsmanager/pom.xml index 1868875ea..1d562b020 100644 --- a/fcapsmanager/pom.xml +++ b/fcapsmanager/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/features/genius-features/pom.xml b/features/genius-features/pom.xml index 0d76e6d76..df4054965 100644 --- a/features/genius-features/pom.xml +++ b/features/genius-features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml index 9775d226d..00a8519b2 100644 --- a/features/odl-genius-api/pom.xml +++ b/features/odl-genius-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 2.6.0-SNAPSHOT + 3.0.1 import pom diff --git a/features/odl-genius-fcaps-application/pom.xml b/features/odl-genius-fcaps-application/pom.xml index b5b49c580..a0df1d495 100644 --- a/features/odl-genius-fcaps-application/pom.xml +++ b/features/odl-genius-fcaps-application/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-genius-fcaps-framework/pom.xml b/features/odl-genius-fcaps-framework/pom.xml index a4438ebe2..b03e76246 100644 --- a/features/odl-genius-fcaps-framework/pom.xml +++ b/features/odl-genius-fcaps-framework/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-genius-rest/pom.xml b/features/odl-genius-rest/pom.xml index 5a83b153d..2bbec237e 100644 --- a/features/odl-genius-rest/pom.xml +++ b/features/odl-genius-rest/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/odl-genius/pom.xml b/features/odl-genius/pom.xml index 495ec6c58..8ff963c0e 100644 --- a/features/odl-genius/pom.xml +++ b/features/odl-genius/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.3 + 4.0.2 diff --git a/features/pom.xml b/features/pom.xml index 5ec33821f..c51fc1716 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/idmanager/idmanager-impl/pom.xml b/idmanager/idmanager-impl/pom.xml index bf01ea331..e3523e8d7 100644 --- a/idmanager/idmanager-impl/pom.xml +++ b/idmanager/idmanager-impl/pom.xml @@ -1,6 +1,6 @@ @@ -206,7 +206,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java index 3653c1257..a90ea6413 100755 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/IfmUtil.java @@ -50,8 +50,8 @@ import org.opendaylight.genius.mdsalutil.actions.ActionSetFieldVlanVid; import org.opendaylight.genius.mdsalutil.actions.ActionSetTunnelDestinationIp; import org.opendaylight.genius.mdsalutil.actions.ActionSetTunnelSourceIp; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java index c127049b5..44552c392 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java @@ -51,8 +51,8 @@ import org.opendaylight.mdsal.eos.binding.api.Entity; import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistration; import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java index 010aaac58..564933e63 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/commons/InterfaceManagerCommonUtils.java @@ -60,7 +60,7 @@ import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchInPort; import org.opendaylight.genius.mdsalutil.nxmatches.NxMatchTunnelDestinationIp; import org.opendaylight.genius.mdsalutil.nxmatches.NxMatchTunnelSourceIp; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Other; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Other; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/diagstatus/IfmDiagStatusProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/diagstatus/IfmDiagStatusProvider.java index 73c06e2ad..19f9b1bfc 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/diagstatus/IfmDiagStatusProvider.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/diagstatus/IfmDiagStatusProvider.java @@ -11,16 +11,15 @@ import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; import org.opendaylight.genius.interfacemanager.IfmConstants; import org.opendaylight.infrautils.diagstatus.DiagStatusService; import org.opendaylight.infrautils.diagstatus.ServiceDescriptor; import org.opendaylight.infrautils.diagstatus.ServiceState; import org.opendaylight.infrautils.diagstatus.ServiceStatusProvider; -import org.ops4j.pax.cdi.api.OsgiServiceProvider; - @Singleton -@OsgiServiceProvider(classes = ServiceStatusProvider.class) +@Service(classes = ServiceStatusProvider.class) public class IfmDiagStatusProvider implements ServiceStatusProvider { private final DiagStatusService diagStatusService; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java index 51c4f6972..701a6ad13 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceInventoryStateListener.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException; import javax.inject.Inject; import javax.inject.Singleton; -import org.checkerframework.checker.nullness.compatqual.NullableDecl; +import org.checkerframework.checker.nullness.qual.Nullable; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.genius.datastoreutils.AsyncClusteredDataTreeChangeListenerBase; @@ -434,9 +434,9 @@ public class InterfaceInventoryStateListener } return Optional.empty(); }).transform(new Function, Void>() { - @NullableDecl + @Nullable @Override - public Void apply(@NullableDecl Optional optionalJob) { + public Void apply(@Nullable Optional optionalJob) { if (optionalJob != null && optionalJob.isPresent()) { txChain.callWithNewReadWriteTransactionAndSubmit(CONFIGURATION, (InterruptibleCheckedConsumer, ? diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceStateListener.java index 518adc4aa..9e111e6c5 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/listeners/InterfaceStateListener.java @@ -21,7 +21,7 @@ import org.opendaylight.genius.interfacemanager.IfmConstants; import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUtils; import org.opendaylight.genius.utils.clustering.EntityOwnershipUtils; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerServiceImpl.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerServiceImpl.java index 9fe7faa25..dbf4b1843 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerServiceImpl.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/rpcservice/InterfaceManagerServiceImpl.java @@ -26,7 +26,7 @@ import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUt import org.opendaylight.genius.interfacemanager.commons.InterfaceMetaUtils; import org.opendaylight.genius.interfacemanager.interfaces.InterfaceManagerService; import org.opendaylight.genius.interfacemanager.listeners.IfIndexInterfaceCache; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigBindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigBindHelper.java index b576e2911..7547c843c 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigBindHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigBindHelper.java @@ -11,8 +11,8 @@ import com.google.common.util.concurrent.ListenableFuture; import java.util.List; import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.config.factory.FlowBasedServicesConfigAddable; import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.bound.services.state.list.BoundServicesState; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices; import org.slf4j.Logger; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigUnbindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigUnbindHelper.java index 320c2e8d8..76f6cc002 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigUnbindHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/AbstractFlowBasedServicesConfigUnbindHelper.java @@ -11,8 +11,8 @@ import com.google.common.util.concurrent.ListenableFuture; import java.util.List; import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.config.factory.FlowBasedServicesConfigRemovable; import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.bound.services.state.list.BoundServicesState; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigBindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigBindHelper.java index 3da4e2672..0410bc9ba 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigBindHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigBindHelper.java @@ -23,8 +23,8 @@ import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUt import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils; import org.opendaylight.genius.mdsalutil.MatchInfo; import org.opendaylight.genius.mdsalutil.NwConstants; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.bound.services.state.list.BoundServicesState; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java index ba6a1c9e4..d76801c71 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/config/helpers/FlowBasedIngressServicesConfigUnbindHelper.java @@ -23,8 +23,8 @@ import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUt import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils; import org.opendaylight.genius.mdsalutil.MatchInfo; import org.opendaylight.genius.mdsalutil.NwConstants; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.bound.services.state.list.BoundServicesState; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java index d74f5c494..5fde90f0f 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/listeners/FlowBasedServicesInterfaceStateListener.java @@ -37,8 +37,8 @@ import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.serviceutils.srm.RecoverableListener; import org.opendaylight.serviceutils.srm.ServiceRecoveryRegistry; import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractClusteredSyncDataTreeChangeListener; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Other; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Other; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeBase; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/AbstractFlowBasedServicesStateBindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/AbstractFlowBasedServicesStateBindHelper.java index 1980b5b7c..d01b05f2c 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/AbstractFlowBasedServicesStateBindHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/AbstractFlowBasedServicesStateBindHelper.java @@ -19,8 +19,8 @@ import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl; import org.opendaylight.genius.infra.TypedReadWriteTransaction; import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.state.factory.FlowBasedServicesStateAddable; import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.ServicesInfo; diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedIngressServicesStateBindHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedIngressServicesStateBindHelper.java index f8c7984f4..c1e5ab4f2 100644 --- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedIngressServicesStateBindHelper.java +++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/state/helpers/FlowBasedIngressServicesStateBindHelper.java @@ -21,8 +21,8 @@ import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUt import org.opendaylight.genius.interfacemanager.servicebindings.flowbased.utilities.FlowBasedServicesUtils; import org.opendaylight.genius.mdsalutil.MatchInfo; import org.opendaylight.genius.mdsalutil.NwConstants; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.service.bindings.services.info.BoundServices; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; diff --git a/interfacemanager/interfacemanager-impl/src/main/resources/org/opendaylight/blueprint/interfacemanager.xml b/interfacemanager/interfacemanager-impl/src/main/resources/OSGI-INF/blueprint/interfacemanager.xml similarity index 100% rename from interfacemanager/interfacemanager-impl/src/main/resources/org/opendaylight/blueprint/interfacemanager.xml rename to interfacemanager/interfacemanager-impl/src/main/resources/OSGI-INF/blueprint/interfacemanager.xml diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java index f408d6a6e..2fc1fcb6e 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerConfigurationTest.java @@ -83,8 +83,8 @@ import org.opendaylight.genius.utils.ServiceIndex; import org.opendaylight.infrautils.inject.guice.testutils.GuiceRule; import org.opendaylight.infrautils.testutils.LogCaptureRule; import org.opendaylight.infrautils.testutils.LogRule; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java index 7d226d654..489d4a8c9 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestModule.java @@ -56,7 +56,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406. import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.config.rev160406.IfmConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.LockManagerService; -import org.ops4j.pax.cdi.api.OsgiService; /** * Dependency Injection Wiring for {@link InterfaceManagerConfigurationTest}. @@ -78,10 +77,9 @@ public class InterfaceManagerTestModule extends AbstractGuiceJsr250Module { DataBrokerTestModule dataBrokerTestModule = new DataBrokerTestModule(false); DataBroker dataBroker = dataBrokerTestModule.getDataBroker(); bind(DataBroker.class).toInstance(dataBroker); - bind(DataBroker.class).annotatedWith(OsgiService.class).toInstance(dataBroker); bind(DataTreeEventCallbackRegistrar.class).toInstance(mock(DataTreeEventCallbackRegistrar.class)); bind(ManagedNewTransactionRunner.class).toInstance(mock(ManagedNewTransactionRunner.class)); - bind(DataImportBootReady.class).annotatedWith(OsgiService.class).toInstance(new DataImportBootReady() {}); + bind(DataImportBootReady.class).toInstance(new DataImportBootReady() {}); bind(LockManagerService.class).to(LockManagerServiceImpl.class); bind(LockListener.class); diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java index 975cdc2a7..c66a88249 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java @@ -27,8 +27,8 @@ import org.opendaylight.genius.interfacemanager.renderer.ovs.utilities.Southboun import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.mdsalutil.MetaDataUtil; import org.opendaylight.genius.mdsalutil.NwConstants; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend index 0c97b7461..3606b892a 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedBoundServiceState.xtend @@ -8,7 +8,7 @@ package org.opendaylight.genius.interfacemanager.test.xtend import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.ServiceModeIngress; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.servicebinding.rev160406.bound.services.state.list.BoundServicesStateBuilder; diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend index bd1c89ff6..ca553a3af 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceConfig.xtend @@ -14,7 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlan.L2vlanMode; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rev160406.IfL2vlanBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId; diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceListFromDpn.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceListFromDpn.xtend index 6b9d89c54..30fc0ac51 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceListFromDpn.xtend +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceListFromDpn.xtend @@ -17,7 +17,7 @@ class ExpectedInterfaceListFromDpn { def static checkDpnToInterfaceList() { (new InterfacesBuilder => [ interfaceName = "23701c04-7e58-4c65-9425-78a80d49a218" - interfaceType = org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan + interfaceType = org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan ]).build() } } diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceState.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceState.xtend index bd1ed5cc8..0196126a9 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceState.xtend +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceState.xtend @@ -13,7 +13,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state._interface.Statistics; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state._interface.StatisticsBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.InterfaceBuilder; diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceType.xtend b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceType.xtend index bd0f6a784..8af77580f 100644 --- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceType.xtend +++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/xtend/ExpectedInterfaceType.xtend @@ -7,7 +7,7 @@ */ package org.opendaylight.genius.interfacemanager.test.xtend -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.L2vlan; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.L2vlan; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.GetInterfaceTypeOutputBuilder; import static extension org.opendaylight.mdsal.binding.testutils.XtendBuilderExtensions.operator_doubleGreaterThan diff --git a/interfacemanager/interfacemanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml b/interfacemanager/interfacemanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml similarity index 100% rename from interfacemanager/interfacemanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml rename to interfacemanager/interfacemanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml diff --git a/interfacemanager/pom.xml b/interfacemanager/pom.xml index 5940c7758..54b9ac2df 100644 --- a/interfacemanager/pom.xml +++ b/interfacemanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/ipv6util/api/pom.xml b/ipv6util/api/pom.xml index e74fc0668..8320cd3fb 100644 --- a/ipv6util/api/pom.xml +++ b/ipv6util/api/pom.xml @@ -30,16 +30,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${openflowplugin.version} - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 - org.opendaylight.mdsal.model - ietf-interfaces - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc7223 org.opendaylight.mdsal.model diff --git a/ipv6util/impl/pom.xml b/ipv6util/impl/pom.xml index 5aa5866be..c1c401604 100644 --- a/ipv6util/impl/pom.xml +++ b/ipv6util/impl/pom.xml @@ -69,7 +69,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/ipv6util/impl/src/main/resources/org/opendaylight/blueprint/ipv6util.xml b/ipv6util/impl/src/main/resources/OSGI-INF/blueprint/ipv6util.xml similarity index 100% rename from ipv6util/impl/src/main/resources/org/opendaylight/blueprint/ipv6util.xml rename to ipv6util/impl/src/main/resources/OSGI-INF/blueprint/ipv6util.xml diff --git a/ipv6util/pom.xml b/ipv6util/pom.xml index b3662836c..105eb5e56 100644 --- a/ipv6util/pom.xml +++ b/ipv6util/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/itm/itm-api/pom.xml b/itm/itm-api/pom.xml index 453e36f37..3a3cc55f3 100644 --- a/itm/itm-api/pom.xml +++ b/itm/itm-api/pom.xml @@ -36,8 +36,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.apache.karaf.shell.console - org.opendaylight.mdsal.model - ietf-interfaces + org.opendaylight.mdsal.binding.model.ietf + rfc7223 org.immutables diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml index 9eecb017d..ab0f483e3 100644 --- a/itm/itm-impl/pom.xml +++ b/itm/itm-impl/pom.xml @@ -84,8 +84,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html diagstatus-api - org.ops4j.pax.cdi - pax-cdi-api + org.apache.aries.blueprint + blueprint-maven-plugin-annotation true @@ -93,8 +93,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html sal-binding-broker-impl - org.opendaylight.mdsal.model - ietf-interfaces + org.opendaylight.mdsal.binding.model.ietf + rfc7223 javax.inject @@ -165,6 +165,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.mockito mockito-core + 1.10.19 test @@ -179,13 +180,39 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.powermock powermock-api-mockito + 1.6.4 test + + org.javassist + javassist + 3.21.0-GA + test + org.powermock powermock-module-junit4 + 1.6.4 test + + org.powermock + powermock-api-support + 1.6.4 + test + + + org.powermock + powermock-reflect + 1.6.4 + test + + + org.powermock + powermock-core + 1.6.4 + test + org.opendaylight.ovsdb utils.southbound-utils diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/TunnelStateCache.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/TunnelStateCache.java index fccf6d0ce..a265ec110 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/TunnelStateCache.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cache/TunnelStateCache.java @@ -10,6 +10,7 @@ package org.opendaylight.genius.itm.cache; import com.google.common.base.Optional; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; @@ -21,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.Tun import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.tunnels_state.StateTunnelList; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.op.rev160406.tunnels_state.StateTunnelListKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.ops4j.pax.cdi.api.OsgiServiceProvider; /** * Caches StateTunnelList objects. @@ -29,7 +29,7 @@ import org.ops4j.pax.cdi.api.OsgiServiceProvider; * @author Thomas Pantelis */ @Singleton -@OsgiServiceProvider(classes = TunnelStateCache.class) // only because TepShowState needs a @Reference to this +@Service(classes = TunnelStateCache.class) // only because TepShowState needs a @Reference to this public class TunnelStateCache extends InstanceIdDataObjectCache { @Inject diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java index dc9575439..fb1eeccfe 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/ItmTunnelAggregationHelper.java @@ -42,7 +42,7 @@ import org.opendaylight.genius.mdsalutil.ActionInfo; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.AdminStatus; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface.OperStatus; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/diagstatus/ItmDiagStatusProvider.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/diagstatus/ItmDiagStatusProvider.java index 7cb8b5835..6416c51ef 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/diagstatus/ItmDiagStatusProvider.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/diagstatus/ItmDiagStatusProvider.java @@ -11,15 +11,15 @@ import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; import org.opendaylight.genius.itm.globals.ITMConstants; import org.opendaylight.infrautils.diagstatus.DiagStatusService; import org.opendaylight.infrautils.diagstatus.ServiceDescriptor; import org.opendaylight.infrautils.diagstatus.ServiceState; import org.opendaylight.infrautils.diagstatus.ServiceStatusProvider; -import org.ops4j.pax.cdi.api.OsgiServiceProvider; @Singleton -@OsgiServiceProvider(classes = ServiceStatusProvider.class) +@Service(classes = ServiceStatusProvider.class) public class ItmDiagStatusProvider implements ServiceStatusProvider { private final DiagStatusService diagStatusService; diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmProvider.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmProvider.java index 7fd9d9e4d..94fb258f4 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmProvider.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmProvider.java @@ -22,6 +22,7 @@ import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Service; import org.apache.felix.service.command.CommandSession; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -68,12 +69,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.A import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.RemoveExternalTunnelEndpointInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rpcs.rev160406.RemoveExternalTunnelEndpointInputBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; -import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Singleton -@OsgiServiceProvider +@Service public class ItmProvider implements AutoCloseable, IITMProvider /*,ItmStateService */ { private static final Logger LOG = LoggerFactory.getLogger(ItmProvider.class); diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java index 861cb893f..5242babea 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java @@ -55,7 +55,7 @@ import org.opendaylight.genius.mdsalutil.actions.ActionPuntToController; import org.opendaylight.genius.mdsalutil.instructions.InstructionApplyActions; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchTunnelId; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.Tunnel; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev170119.Tunnel; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; diff --git a/itm/itm-impl/src/main/resources/org/opendaylight/blueprint/itm.xml b/itm/itm-impl/src/main/resources/OSGI-INF/blueprint/itm.xml similarity index 99% rename from itm/itm-impl/src/main/resources/org/opendaylight/blueprint/itm.xml rename to itm/itm-impl/src/main/resources/OSGI-INF/blueprint/itm.xml index 13d36ef7c..99c9734b8 100644 --- a/itm/itm-impl/src/main/resources/org/opendaylight/blueprint/itm.xml +++ b/itm/itm-impl/src/main/resources/OSGI-INF/blueprint/itm.xml @@ -47,7 +47,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - + org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index 20a753293..50a954bad 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 3.1.3 + 4.0.2 diff --git a/lockmanager/lockmanager-impl/pom.xml b/lockmanager/lockmanager-impl/pom.xml index 82a0a63e9..1ce9994ac 100644 --- a/lockmanager/lockmanager-impl/pom.xml +++ b/lockmanager/lockmanager-impl/pom.xml @@ -46,11 +46,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject - org.ops4j.pax.cdi - pax-cdi-api + org.apache.aries.blueprint + blueprint-maven-plugin-annotation true - org.opendaylight.genius @@ -95,7 +94,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockListener.java b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockListener.java index b6d3c71d5..5503aa828 100644 --- a/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockListener.java +++ b/lockmanager/lockmanager-impl/src/main/java/org/opendaylight/genius/lockmanager/impl/LockListener.java @@ -12,6 +12,7 @@ import javax.annotation.Nonnull; import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Reference; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.infrautils.utils.concurrent.Executors; @@ -19,7 +20,6 @@ import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractClusteredAsync import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.Locks; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev160413.locks.Lock; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.ops4j.pax.cdi.api.OsgiService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ public class LockListener extends AbstractClusteredAsyncDataTreeChangeListener org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml index dd0e532bf..45d161c1f 100644 --- a/mdsalutil/mdsalutil-api/pom.xml +++ b/mdsalutil/mdsalutil-api/pom.xml @@ -123,8 +123,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.osgi.core - org.ops4j.pax.cdi - pax-cdi-api + org.apache.aries.blueprint + blueprint-maven-plugin-annotation true diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java index 0e0a8a935..312778323 100644 --- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java +++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/clustering/EntityOwnershipUtils.java @@ -74,7 +74,7 @@ public class EntityOwnershipUtils { */ public boolean isEntityOwner(Entity entity, long sleepBetweenRetries, int tries) { while (true) { - Optional entityState = entityOwnershipService.getOwnershipState(entity); + java.util.Optional entityState = entityOwnershipService.getOwnershipState(entity); if (entityState.isPresent()) { EntityOwnershipState entityOwnershipState = entityState.get(); return entityOwnershipState == EntityOwnershipState.IS_OWNER; diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml index 9c97eb52f..129e2abd3 100644 --- a/mdsalutil/mdsalutil-impl/pom.xml +++ b/mdsalutil/mdsalutil-impl/pom.xml @@ -70,8 +70,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.3.0-SNAPSHOT - org.ops4j.pax.cdi - pax-cdi-api + org.apache.aries.blueprint + blueprint-maven-plugin-annotation true @@ -94,13 +94,45 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.powermock powermock-module-junit4 + 1.6.4 test org.powermock powermock-api-mockito + 1.6.4 test + + org.powermock + powermock-api-support + 1.6.4 + test + + + org.powermock + powermock-reflect + 1.6.4 + test + + + org.powermock + powermock-core + 1.6.4 + test + + + org.javassist + javassist + 3.21.0-GA + test + + + org.mockito + mockito-core + 1.10.19 + test + org.opendaylight.controller sal-binding-broker-impl @@ -147,7 +179,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java index b2ffe3bcc..66dc3d4da 100644 --- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java +++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java @@ -25,6 +25,8 @@ import javax.annotation.concurrent.GuardedBy; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Reference; +import org.apache.aries.blueprint.annotation.service.Service; import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; @@ -36,8 +38,6 @@ import org.opendaylight.infrautils.utils.concurrent.Executors; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.ops4j.pax.cdi.api.OsgiService; -import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; */ @Beta @Singleton -@OsgiServiceProvider(classes = DataTreeEventCallbackRegistrar.class) +@Service(classes = DataTreeEventCallbackRegistrar.class) public class DataTreeEventCallbackRegistrarImpl implements DataTreeEventCallbackRegistrar { // This implementation is, intentionally, kept very simple and thin. If during usage we see @@ -65,7 +65,7 @@ public class DataTreeEventCallbackRegistrarImpl implements DataTreeEventCallback private final ScheduledExecutorService scheduledExecutorService; @Inject - public DataTreeEventCallbackRegistrarImpl(@OsgiService DataBroker dataBroker) { + public DataTreeEventCallbackRegistrarImpl(@Reference DataBroker dataBroker) { this(dataBroker, Executors.newSingleThreadScheduledExecutor("DataTreeEventCallbackRegistrar-Timeouter", LOG)); } diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/diagstatus/internal/DatastoreServiceStatusProvider.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/diagstatus/internal/DatastoreServiceStatusProvider.java index b6c636594..443c06e33 100644 --- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/diagstatus/internal/DatastoreServiceStatusProvider.java +++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/diagstatus/internal/DatastoreServiceStatusProvider.java @@ -14,6 +14,8 @@ import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; import javax.management.MalformedObjectNameException; +import org.apache.aries.blueprint.annotation.service.Reference; +import org.apache.aries.blueprint.annotation.service.Service; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStatsMXBean; import org.opendaylight.controller.cluster.datastore.shardmanager.ShardManagerInfoMBean; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -22,13 +24,11 @@ import org.opendaylight.infrautils.diagstatus.MBeanUtils; import org.opendaylight.infrautils.diagstatus.ServiceDescriptor; import org.opendaylight.infrautils.diagstatus.ServiceState; import org.opendaylight.infrautils.diagstatus.ServiceStatusProvider; -import org.ops4j.pax.cdi.api.OsgiService; -import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Singleton -@OsgiServiceProvider(classes = ServiceStatusProvider.class) +@Service(classes = ServiceStatusProvider.class) public class DatastoreServiceStatusProvider implements ServiceStatusProvider { private static final Logger LOG = LoggerFactory.getLogger(DatastoreServiceStatusProvider.class); @@ -41,8 +41,8 @@ public class DatastoreServiceStatusProvider implements ServiceStatusProvider { private final List allShardStats; @Inject - public DatastoreServiceStatusProvider(@OsgiService DiagStatusService diagStatusService, - @OsgiService DataBroker dataBroker) throws MalformedObjectNameException { + public DatastoreServiceStatusProvider(@Reference DiagStatusService diagStatusService, + @Reference DataBroker dataBroker) throws MalformedObjectNameException { this.diagStatusService = diagStatusService; diagStatusService.register(DATASTORE_SERVICE_NAME); diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/MDSALManager.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/MDSALManager.java index 6322bc8e1..f993902f8 100644 --- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/MDSALManager.java +++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/MDSALManager.java @@ -450,7 +450,7 @@ public class MDSALManager extends AbstractLifecycle implements IMdsalApiManager @Override protected void remove(InstanceIdentifier identifier, Group del) { - BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class).getId().getValue()); executeNotifyTaskIfRequired(dpId, del); } @@ -465,13 +465,13 @@ public class MDSALManager extends AbstractLifecycle implements IMdsalApiManager @Override protected void update(InstanceIdentifier identifier, Group original, Group update) { - BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class).getId().getValue()); executeNotifyTaskIfRequired(dpId, update); } @Override protected void add(InstanceIdentifier identifier, Group add) { - BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class).getId().getValue()); executeNotifyTaskIfRequired(dpId, add); } @@ -495,7 +495,7 @@ public class MDSALManager extends AbstractLifecycle implements IMdsalApiManager @Override protected void remove(InstanceIdentifier identifier, Flow del) { - BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class).getId().getValue()); notifyTaskIfRequired(dpId, del); } @@ -514,7 +514,7 @@ public class MDSALManager extends AbstractLifecycle implements IMdsalApiManager @Override protected void add(InstanceIdentifier identifier, Flow add) { - BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class).getId().getValue()); notifyTaskIfRequired(dpId, add); } @@ -539,7 +539,7 @@ public class MDSALManager extends AbstractLifecycle implements IMdsalApiManager @Override protected void remove(InstanceIdentifier identifier, Flow del) { - BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class).getId().getValue()); flowLog.trace("FlowId {} deleted from Table {} on DPN {}", del.getId().getValue(), del.getTableId(), dpId); } @@ -550,7 +550,7 @@ public class MDSALManager extends AbstractLifecycle implements IMdsalApiManager @Override protected void add(InstanceIdentifier identifier, Flow add) { - BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class, NodeKey.class).getId().getValue()); + BigInteger dpId = getDpnFromString(identifier.firstKeyOf(Node.class).getId().getValue()); flowLog.debug("FlowId {} added to Table {} on DPN {}", add.getId().getValue(), add.getTableId(), dpId); } diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeStateListener.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeStateListener.java index 9a3a4d57b..baec199b0 100644 --- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeStateListener.java +++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeStateListener.java @@ -13,6 +13,7 @@ import javax.annotation.Nonnull; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Reference; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; @@ -20,7 +21,6 @@ import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker; import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractSyncDataTreeChangeListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsalutil.rev170830.Config; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.ops4j.pax.cdi.api.OsgiService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,7 +42,7 @@ public class UpgradeStateListener extends AbstractSyncDataTreeChangeListener(CONFIGURATION, CONFIG_IID)); this.upgradeUtils = upgradeStateUtils; diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeUtils.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeUtils.java index 6c1e1d839..8222b2d28 100644 --- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeUtils.java +++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/mdsalutil/internal/UpgradeUtils.java @@ -13,12 +13,12 @@ import static org.opendaylight.genius.infra.Datastore.CONFIGURATION; import java.util.concurrent.ExecutionException; import javax.inject.Inject; import javax.inject.Singleton; +import org.apache.aries.blueprint.annotation.service.Reference; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.genius.infra.RetryingManagedNewTransactionRunner; import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180702.UpgradeConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180702.UpgradeConfigBuilder; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.ops4j.pax.cdi.api.OsgiService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +30,7 @@ public class UpgradeUtils { private final RetryingManagedNewTransactionRunner txRunner; @Inject - public UpgradeUtils(@OsgiService final DataBroker dataBroker) { + public UpgradeUtils(@Reference final DataBroker dataBroker) { this.dataBroker = dataBroker; this.txRunner = new RetryingManagedNewTransactionRunner(dataBroker); } diff --git a/mdsalutil/mdsalutil-impl/src/main/resources/org/opendaylight/blueprint/mdsalutil.xml b/mdsalutil/mdsalutil-impl/src/main/resources/OSGI-INF/blueprint/mdsalutil.xml similarity index 100% rename from mdsalutil/mdsalutil-impl/src/main/resources/org/opendaylight/blueprint/mdsalutil.xml rename to mdsalutil/mdsalutil-impl/src/main/resources/OSGI-INF/blueprint/mdsalutil.xml diff --git a/mdsalutil/mdsalutil-testutils/pom.xml b/mdsalutil/mdsalutil-testutils/pom.xml index 8b4797fc1..daa745710 100644 --- a/mdsalutil/mdsalutil-testutils/pom.xml +++ b/mdsalutil/mdsalutil-testutils/pom.xml @@ -107,8 +107,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html compile - org.ops4j.pax.cdi - pax-cdi-api + org.apache.aries.blueprint + blueprint-maven-plugin-annotation true diff --git a/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java b/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java index 9607e8789..17cc2001f 100644 --- a/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java +++ b/mdsalutil/mdsalutil-testutils/src/main/java/org/opendaylight/genius/datastoreutils/testutils/DataBrokerFailuresModule.java @@ -10,7 +10,6 @@ package org.opendaylight.genius.datastoreutils.testutils; import com.google.inject.AbstractModule; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestModule; -import org.ops4j.pax.cdi.api.OsgiService; /** * Guice Module which correctly binds the {@link DataBrokerFailures}. @@ -33,7 +32,7 @@ public class DataBrokerFailuresModule extends AbstractModule { protected void configure() { DataBrokerFailuresImpl testableDataBroker = new DataBrokerFailuresImpl(realDataBroker); bind(DataBroker.class).toInstance(testableDataBroker); - bind(DataBroker.class).annotatedWith(OsgiService.class).toInstance(testableDataBroker); + // bind(DataBroker.class).annotatedWith(Reference.class).toInstance(testableDataBroker); bind(DataBrokerFailures.class).toInstance(testableDataBroker); } } diff --git a/mdsalutil/pom.xml b/mdsalutil/pom.xml index 18b71a224..5a9a4d9d8 100644 --- a/mdsalutil/pom.xml +++ b/mdsalutil/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/pom.xml b/pom.xml index 0496605f8..afff235ae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,15 +4,14 @@ Copyright © 2016 Ericsson India Global Services Pvt Ltd. and others. All right This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, -and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ---> +and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> 4.0.0 org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/resourcemanager/pom.xml b/resourcemanager/pom.xml index 913344e71..57e516ebd 100644 --- a/resourcemanager/pom.xml +++ b/resourcemanager/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 3.1.3 + 4.0.2 diff --git a/resourcemanager/resourcemanager-impl/pom.xml b/resourcemanager/resourcemanager-impl/pom.xml index 420969f32..aef0dd820 100644 --- a/resourcemanager/resourcemanager-impl/pom.xml +++ b/resourcemanager/resourcemanager-impl/pom.xml @@ -107,7 +107,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html false false false - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true true diff --git a/resourcemanager/resourcemanager-impl/src/main/resources/org/opendaylight/blueprint/resourcemanager.xml b/resourcemanager/resourcemanager-impl/src/main/resources/OSGI-INF/blueprint/resourcemanager.xml similarity index 100% rename from resourcemanager/resourcemanager-impl/src/main/resources/org/opendaylight/blueprint/resourcemanager.xml rename to resourcemanager/resourcemanager-impl/src/main/resources/OSGI-INF/blueprint/resourcemanager.xml -- 2.36.6