[java-parent-project] branch master updated: IDP-1465 - Update JAXB dependencies

[Ian Young]

This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-parent-project.

View the commit online:
http://git.shibboleth.net/view/?p=java-parent-project.git;a=commit;h=4b3ecf6fbf9bd40b3ec06c83ee87c4bad7333bf1

The following commit(s) were added to refs/heads/master by this push:
       new  4b3ecf6   IDP-1465 - Update JAXB dependencies
4b3ecf6 is described below

commit 4b3ecf6fbf9bd40b3ec06c83ee87c4bad7333bf1
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Jan 27 19:51:12 2020 +0000

    IDP-1465 - Update JAXB dependencies
    
    https://issues.shibboleth.net/jira/browse/IDP-1465
---
 pom.xml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 89fa6da..bd8b84a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
         <httpclient.httpcore.version>4.4.13</httpclient.httpcore.version>
         <guava.version>28.2-jre</guava.version>
         <jakarta.activation.version>1.2.1</jakarta.activation.version>
+        <jakarta.jaxb.version>2.3.2</jakarta.jaxb.version>
         <jakarta.json.version>1.1.6</jakarta.json.version>
         <jakarta.mail.version>1.6.4</jakarta.mail.version>
         <jetty.groupId>org.eclipse.jetty</jetty.groupId>
@@ -310,14 +311,9 @@
 
             <!-- Needed for JAXB support. -->
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
-                <version>2.3.1</version>
-            </dependency>
-            <dependency>
-                <groupId>org.glassfish.jaxb</groupId>
-                <artifactId>jaxb-runtime</artifactId>
-                <version>2.3.2</version>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
+                <version>${jakarta.jaxb.version}</version>
             </dependency>
 
             <dependency>
@@ -381,6 +377,10 @@
                         <groupId>javax.activation</groupId>
                         <artifactId>javax.activation-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -530,6 +530,12 @@
                 <version>${jakarta.json.version}</version>
                 <scope>runtime</scope>
             </dependency>
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${jakarta.jaxb.version}</version>
+                <scope>runtime</scope>
+            </dependency>
 
             <!-- Test dependencies -->
             <dependency>
@@ -543,6 +549,12 @@
                 <artifactId>xmlunit-core</artifactId>
                 <version>${xmlunit.version}</version>
                 <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.xmlunit</groupId>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.