From 8118a5da123eebf172d062324eb7344c63586aa8 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 9 Oct 2018 13:26:15 +0200
Subject: [PATCH] jaxb-api should be scope=compile

Keeping scope=provided breaks downstream tests with JDK9+,
hence we need to rework the dependencies to make sure we always
pull jaxb-api, but we also need to exclude it from odl-yangtools-data
feature, because it is provided by Karaf.

Change-Id: Id09281c89a74c3d6c780179dfa21ced545318ba1
JIRA: YANGTOOLS-906
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit eeb3076563314a67ccbe2d083dede2051d12e060)
---
 features/odl-yangtools-data/pom.xml | 7 +++++++
 yang/yang-data-impl/pom.xml         | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index a55d95b1a3..b6cccd2b88 100644
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -45,6 +45,13 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
+            <exclusions>
+                <exclusion>
+                    <!-- jaxb-api is providided by karaf boot classpath -->
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 3efc4438c1..b68a0e3140 100644
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -152,7 +152,6 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.2.1</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
-- 
2.36.6