Add missing annotation dependencies for Java 11

... and drop an extraneous CORBA import!

Change-Id: I9062d07f9b9af3eb35c99bb0c4697b8e6fac33eb
Signed-off-by: Stephen Kitt <skitt@redhat.com>

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 a8b19b677709c22f473512896c324f641995b044..ed501448669f0c515589efec778487c72fceef2d 100644 (file)
--- 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 8ed491a836f3fdeac80762035df9f1d2f1acdf9a..9b3f1b31b10dceee1439fe532b67888aa3b92d86 100644 (file)
--- a/cloud-servicechain/impl/pom.xml
+++ b/cloud-servicechain/impl/pom.xml
@@ -27,6 +27,7 @@
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/coe/impl/pom.xml b/coe/impl/pom.xml
index 1b62d350d7679ccba67ab220eec3295a484e8347..83281d82ec188f9cb0a6c4f463e08be82c61d0c3 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.coe</groupId>

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 88a9c2bc75012cf89ebade4d922b2cf476d23dde..69c469cc5fa377fdb7ad631a8475aa7eb9f060d8 100644 (file)
--- 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
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Ensure that annotation dependencies are optional throughout -->
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/dhcpservice/impl/pom.xml b/dhcpservice/impl/pom.xml
index 37d850a7c7e87ce21df722ecdf2a075932fe9bd1..f1098ba431dda22bb1846b164c1479aed24b46ed 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>

diff --git a/fibmanager/impl/pom.xml b/fibmanager/impl/pom.xml
index 36ac3d07613d5301c8ac4b2e7bac4088834fe242..540a1d4b052743837b9105d38d3e8a0891eaf2cb 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>

diff --git a/ipv6service/impl/pom.xml b/ipv6service/impl/pom.xml
index 0ff4c115bf27c8a1efe94f85cde4e5c7d4612ad6..6636d48ab83d6661874b51d3eb7bbba66b5be16f 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/natservice/impl/pom.xml b/natservice/impl/pom.xml
index 894c0a3054d9978c8838c832da1279b7fb805531..ef8c87155a6d6e4343e95d71c54a71bf7196779c 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/neutronvpn/impl/pom.xml b/neutronvpn/impl/pom.xml
index 1306e36c34a463fc919ebfb97ed3f1e44311d05f..37c62eead74c559c96ffb1c91b92c64f78a7453d 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>

diff --git a/policyservice/impl/pom.xml b/policyservice/impl/pom.xml
index 16b0ee6fd09dde593b4ae19664621aff39bec211..bbd259cca21775b78e5acc99ff71e720fd532541 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>

diff --git a/statemanager/impl/pom.xml b/statemanager/impl/pom.xml
index e430459eeb9ecf23eb71086c81d6821df74351fe..807d612fecf72507987621eb0f54149ce1f489ac 100644 (file)
--- 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
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/statistics/impl/pom.xml b/statistics/impl/pom.xml
index 1684c8070bc0f09fce592c4b8bcd8c114b76bade..74dd3ae7c1bc818b71f8b8096f4fd4fb37aba539 100644 (file)
--- a/statistics/impl/pom.xml
+++ b/statistics/impl/pom.xml
@@ -24,6 +24,7 @@ at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>