Add javax.annotation-api dependencies

Java 11 no longer ships these annotations, hence they need to be
declared. The annotations are provided by the container, hence
we scope them as provided.

Change-Id: Idc66357f723eb62f8b7a8af3db533f11215fefbc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/applications/arbitratorreconciliation/impl/pom.xml b/applications/arbitratorreconciliation/impl/pom.xml
index c83e37e2eb46cddeb1ab2fa894bc42e0b3191ed5..1118040477407c599636c58d716bf0a5b1166f07 100644 (file)
--- a/applications/arbitratorreconciliation/impl/pom.xml
+++ b/applications/arbitratorreconciliation/impl/pom.xml
@@ -28,6 +28,11 @@
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/applications/device-ownership-service/pom.xml b/applications/device-ownership-service/pom.xml
index 518b9a2c681ef573b476a4ba4eb3c18af731efe5..ce4aa767b6dfee2400426d91bc9d42bbc00bb495 100644 (file)
--- a/applications/device-ownership-service/pom.xml
+++ b/applications/device-ownership-service/pom.xml
@@ -21,6 +21,11 @@
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml
index 494ee56a8604c7bed606579eb29435f8df4abe7e..6ebb919b4f7950b003bda28047d099330cf71139 100644 (file)
--- a/applications/forwardingrules-manager/pom.xml
+++ b/applications/forwardingrules-manager/pom.xml
@@ -15,6 +15,11 @@
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>

diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml
index c5928645948d1aaa4be19aaabac460adfdd86d9e..effdbfb1878ef952c688b60133250fb21bbec459 100644 (file)
--- a/applications/of-switch-config-pusher/pom.xml
+++ b/applications/of-switch-config-pusher/pom.xml
@@ -59,6 +59,11 @@
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml
index f0201b4a019da4f470cbb25e520b64de50034aab..44e3980c7dba6752e01ac237577f3e67ef08e0da 100644 (file)
--- a/applications/reconciliation-framework/pom.xml
+++ b/applications/reconciliation-framework/pom.xml
@@ -73,6 +73,11 @@
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml
index fd2d3fb670435ef024f5e48a4c77261631b4d914..2923a22447214ced3d65747abe6dd029f3a1c4be 100644 (file)
--- a/applications/southbound-cli/pom.xml
+++ b/applications/southbound-cli/pom.xml
@@ -76,6 +76,11 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 </project>

diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml
index 1e843bd7e6691c26008bd3d9244b0d0c5365b92d..c05e4a6b524db8649718c6ef6239f64cc174fca7 100644 (file)
--- a/applications/topology-lldp-discovery/pom.xml
+++ b/applications/topology-lldp-discovery/pom.xml
@@ -69,6 +69,11 @@
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml
index bc2673c9adf9de3c6325bbb6e890798c7094310e..a56ac63483b1d0a1510384b61b260203813494e2 100644 (file)
--- a/applications/topology-manager/pom.xml
+++ b/applications/topology-manager/pom.xml
@@ -65,6 +65,11 @@
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml
index 52d5c9269b9f35344ed55987fb6c4289378e8f99..b8660be482782b07b5211e4500a4bbb22b108803 100644 (file)
--- a/openflowplugin-impl/pom.xml
+++ b/openflowplugin-impl/pom.xml
@@ -83,6 +83,11 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>

diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index df6aa2af1523fc00318b1f9d62606761c5a3323f..1f8f1a4486bdce6176373b45b4b47cac8b5a7ab5 100644 (file)
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -52,6 +52,11 @@
             <artifactId>javax.inject</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
             <artifactId>blueprint-maven-plugin-annotation</artifactId>