From 78b21d9bde28cd2a659bbc85a9935391dea276bd Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 30 Jan 2019 10:41:14 +0100 Subject: [PATCH] Add missing annotation dependencies for Java 11 ... and drop an extraneous CORBA import! Change-Id: I9062d07f9b9af3eb35c99bb0c4697b8e6fac33eb Signed-off-by: Stephen Kitt --- .../opendaylight/netvirt/bgpmanager/commands/Multipath.java | 1 - cloud-servicechain/impl/pom.xml | 1 + coe/impl/pom.xml | 1 + commons/binding-parent/pom.xml | 6 ++++++ dhcpservice/impl/pom.xml | 1 + fibmanager/impl/pom.xml | 1 + ipv6service/impl/pom.xml | 1 + natservice/impl/pom.xml | 1 + neutronvpn/impl/pom.xml | 1 + policyservice/impl/pom.xml | 1 + statemanager/impl/pom.xml | 1 + statistics/impl/pom.xml | 1 + 12 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java index a8b19b6777..ed50144866 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Multipath.java @@ -12,7 +12,6 @@ import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.commands.Option; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.omg.CORBA.Object; import org.opendaylight.netvirt.bgpmanager.BgpConfigurationManager; import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_afi; import org.opendaylight.netvirt.bgpmanager.thrift.gen.af_safi; diff --git a/cloud-servicechain/impl/pom.xml b/cloud-servicechain/impl/pom.xml index 8ed491a836..9b3f1b31b1 100644 --- a/cloud-servicechain/impl/pom.xml +++ b/cloud-servicechain/impl/pom.xml @@ -27,6 +27,7 @@ javax.inject javax.inject + true org.opendaylight.controller diff --git a/coe/impl/pom.xml b/coe/impl/pom.xml index 1b62d350d7..83281d82ec 100644 --- a/coe/impl/pom.xml +++ b/coe/impl/pom.xml @@ -24,6 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.coe diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml index 88a9c2bc75..69c469cc5f 100644 --- a/commons/binding-parent/pom.xml +++ b/commons/binding-parent/pom.xml @@ -58,6 +58,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mockito-core test + + + javax.annotation + javax.annotation-api + true + diff --git a/dhcpservice/impl/pom.xml b/dhcpservice/impl/pom.xml index 37d850a7c7..f1098ba431 100644 --- a/dhcpservice/impl/pom.xml +++ b/dhcpservice/impl/pom.xml @@ -25,6 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true commons-net diff --git a/fibmanager/impl/pom.xml b/fibmanager/impl/pom.xml index 36ac3d0761..540a1d4b05 100644 --- a/fibmanager/impl/pom.xml +++ b/fibmanager/impl/pom.xml @@ -29,6 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.genius diff --git a/ipv6service/impl/pom.xml b/ipv6service/impl/pom.xml index 0ff4c115bf..6636d48ab8 100644 --- a/ipv6service/impl/pom.xml +++ b/ipv6service/impl/pom.xml @@ -25,6 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.controller diff --git a/natservice/impl/pom.xml b/natservice/impl/pom.xml index 894c0a3054..ef8c87155a 100644 --- a/natservice/impl/pom.xml +++ b/natservice/impl/pom.xml @@ -33,6 +33,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.controller diff --git a/neutronvpn/impl/pom.xml b/neutronvpn/impl/pom.xml index 1306e36c34..37c62eead7 100644 --- a/neutronvpn/impl/pom.xml +++ b/neutronvpn/impl/pom.xml @@ -33,6 +33,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.genius diff --git a/policyservice/impl/pom.xml b/policyservice/impl/pom.xml index 16b0ee6fd0..bbd259cca2 100644 --- a/policyservice/impl/pom.xml +++ b/policyservice/impl/pom.xml @@ -25,6 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.genius diff --git a/statemanager/impl/pom.xml b/statemanager/impl/pom.xml index e430459eeb..807d612fec 100644 --- a/statemanager/impl/pom.xml +++ b/statemanager/impl/pom.xml @@ -29,6 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.controller diff --git a/statistics/impl/pom.xml b/statistics/impl/pom.xml index 1684c8070b..74dd3ae7c1 100644 --- a/statistics/impl/pom.xml +++ b/statistics/impl/pom.xml @@ -24,6 +24,7 @@ at http://www.eclipse.org/legal/epl-v10.html javax.inject javax.inject + true org.opendaylight.genius -- 2.36.6