Eliminate unneeded jaxb-api version/exclusion

odlparent is declaring the correct dependency, reuse it from there.

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

diff --git a/aaa-authn-api/pom.xml b/aaa-authn-api/pom.xml
index 0a65290489f5ada63f300966e845dabe76f4ef4e..f5ec2b93c22b1338045e412cab3d5e15629c0c15 100644 (file)
--- a/aaa-authn-api/pom.xml
+++ b/aaa-authn-api/pom.xml
@@ -34,15 +34,6 @@
     <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 1b5ec5c52acf8e4607af43fe1abd5c23425c70af..d1f5fb7af21dbcc99f6445aa058c983e134864c8 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -36,15 +36,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <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 -->

diff --git a/aaa-encrypt-service/impl/pom.xml b/aaa-encrypt-service/impl/pom.xml
index 07de4271abdff51f24d081f2aacd47ade2b30568..9d969bff4d21fcad6e6530e5a51e9197f2c9d842 100644 (file)
--- a/aaa-encrypt-service/impl/pom.xml
+++ b/aaa-encrypt-service/impl/pom.xml
@@ -54,15 +54,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <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>

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index be374bfd6b89e06707efa1da22750b82a58a13cf..91d286a7b3f93108ca152710f75ce90952682efc 100644 (file)
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -28,14 +28,6 @@
             <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.odlparent</groupId>