Remove unneeded jaxb-api workarounds

odlparent-4.0.5 provides a correct declaration of jaxb-api
and exclusions, hence we can remove them.

Change-Id: I91bd84fc7c8bd566d178a875df0d07addf08893b
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 8c64824e6da9c49408bea129e76e1b22fb1acb16..e2426dbb27777c32a2384c98a9846600b6dd12c4 100644 (file)
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -51,13 +51,6 @@
         <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 4fb53e83d902f5ea16b91412d0542e63f5c10d64..aa406cae6d6d6297141327bee850f578623a409a 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -134,14 +134,6 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.2.1</version>
-            <exclusions>
-                <exclusion>
-                    <!-- Provided by JDK -->
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>