Fix compilation with JDK11

This adds javax.activation and JAXB dependencies as needed.

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

diff --git a/neutron-hostconfig/ovs/pom.xml b/neutron-hostconfig/ovs/pom.xml
index c2a8318ecb1caeb885c8760924a03952aae5b6da..7217399b3373d11c7b3057b21e4fc57f782e11eb 100644 (file)
--- a/neutron-hostconfig/ovs/pom.xml
+++ b/neutron-hostconfig/ovs/pom.xml
@@ -58,6 +58,13 @@
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+      <!-- FIXME: remove version with odlparent-4.0.8 -->
+      <version>1.2</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/neutron-logger/pom.xml b/neutron-logger/pom.xml
index f400ac15200cc5223828084f8701f832b35c2e75..8289636df3a13c0478ad19262cdc0d1a68037a06 100644 (file)
--- a/neutron-logger/pom.xml
+++ b/neutron-logger/pom.xml
@@ -41,6 +41,13 @@
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+      <!-- FIXME: remove version with odlparent-4.0.8 -->
+      <version>1.2</version>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/neutron-spi/pom.xml b/neutron-spi/pom.xml
index aa309f03be859840ebc1414d14019a6518a776c5..b243daa540f4d90a8abb0019dd0104512b239bbe 100644 (file)
--- a/neutron-spi/pom.xml
+++ b/neutron-spi/pom.xml
@@ -54,6 +54,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index 99220abb5046df6ae8d4172cdb882f77eae1cf43..2b8da07496a341802dd1deb05ab9ed9d49c59127 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -66,6 +66,14 @@
       <artifactId>javax.inject</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+      <!-- FIXME: remove version with odlparent-4.0.8 -->
+      <version>1.2</version>
+    </dependency>
+
     <dependency>
      <groupId>org.apache.aries.blueprint</groupId>
      <artifactId>blueprint-maven-plugin-annotation</artifactId>

diff --git a/transcriber/pom.xml b/transcriber/pom.xml
index a38221b9914a62f3dc0d8e7e0b9671b2fa8b8e74..260dacf113f17af327afef91fb2472390f778710 100644 (file)
--- a/transcriber/pom.xml
+++ b/transcriber/pom.xml
@@ -79,6 +79,13 @@
       <groupId>javax.inject</groupId>
       <artifactId>javax.inject</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <optional>true</optional>
+      <!-- FIXME: remove version with odlparent-4.0.8 -->
+      <version>1.2</version>
+    </dependency>
   </dependencies>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>