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>

diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 86fb6585a024eca2e8bc688492e963f66fd490cf..192a124295d8a7a603b77827a77cec6c33dd32bf 100644 (file)
--- 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 33a0988dc964cacc680972b16cf990c1a5804a6d..4af4e35c54d97b7040a743827c5e18211fdc2b07 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -150,7 +150,6 @@
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>2.2.1</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>