Require jaxb-api

Java 9+ does not contain jaxb-api classes, hence we need to add
an explicit dependency. Since karaf is providing it in runtime,
we also need corresponding feature exclusions -- which will be
rendered unnecessary with odlparent-4.0.3.

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

diff --git a/aaa-authn-api/pom.xml b/aaa-authn-api/pom.xml
index f6bf310367d71692dba00cc9dbfea8067033e25c..0a65290489f5ada63f300966e845dabe76f4ef4e 100644 (file)
--- a/aaa-authn-api/pom.xml
+++ b/aaa-authn-api/pom.xml
@@ -31,5 +31,18 @@
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <!-- FIXME: eliminate version/exclusions with odlparent-4.0.3 -->
+      <version>2.2.1</version>
+      <exclusions>
+        <exclusion>
+          <!-- Provided by JDK -->
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 </project>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index e89933f946491f8bcf5dc04da6724988b4e5ff47..1b5ec5c52acf8e4607af43fe1abd5c23425c70af 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -33,6 +33,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <!-- FIXME: eliminate version/exclusions with odlparent-4.0.3 -->
+      <version>2.2.1</version>
+      <exclusions>
+        <exclusion>
+          <!-- Provided by JDK -->
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 
     <!-- Bouncy Castle dependency -->
     <dependency>

diff --git a/aaa-encrypt-service/impl/pom.xml b/aaa-encrypt-service/impl/pom.xml
index 89e2322d05dfa3efbfc5227b399c74e8b19cfbf0..c7730c42bc4971c348f8063e9cab1ed48665ef3c 100644 (file)
--- a/aaa-encrypt-service/impl/pom.xml
+++ b/aaa-encrypt-service/impl/pom.xml
@@ -55,6 +55,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <!-- FIXME: eliminate version/exclusions with odlparent-4.0.3 -->
+      <version>2.2.1</version>
+      <exclusions>
+        <exclusion>
+          <!-- Provided by JDK -->
+          <groupId>javax.xml.stream</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 727042ccc38d1bd586fa0db5224533c2163e212d..ef4c24c89bf021d4ab9c78894876c0853494c023 100644 (file)
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -28,6 +28,14 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>aaa-authn-api</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <!-- jaxb-api is providided by karaf boot classpath -->
+                    <!-- FIXME: remove with odlparent-4.0.3 -->
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>