From aa2648d87835d712c3c05b095dac8c63278fa3f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Fri, 23 Nov 2018 10:08:15 +0100
Subject: [PATCH] HHH-13043 Upgrade to JAXB 2.3.1

... which has a correctly formatted POM, and doesn't wreak havoc in
projects depending on us and using Maven + JDK11.
---
 gradle/libraries.gradle              | 16 ++++++++++------
 hibernate-core/hibernate-core.gradle |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index 87cb621c9c..cad0dc9a74 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -36,6 +36,11 @@ ext {
 
     jodaTimeVersion = '2.3'
 
+    jaxbApiVersion = '2.3.1'
+    // We can't upgrade JAXB in Karaf (yet), but fortunately everything works fine with the version built in Karaf
+    jaxbApiVersionOsgiRange = "[2.2,3)"
+    jaxbRuntimeVersion = '2.3.1'
+
     libraries = [
             // Ant
             ant:            'org.apache.ant:ant:1.8.2',
@@ -75,14 +80,13 @@ ext {
             logging_processor:  'org.jboss.logging:jboss-logging-processor:2.1.0.Final',
 
             // jaxb task
-            // Strangely, jaxb-runtime 2.2.11 depends on jaxb-api 2.2.12-b140109.1041
-            jaxb_api: 'javax.xml.bind:jaxb-api:2.2.12-b140109.1041',
-            jaxb_runtime: 'org.glassfish.jaxb:jaxb-runtime:2.2.11',
-            jaxb_xjc: 'org.glassfish.jaxb:jaxb-xjc:2.2.11',
+            jaxb_api: "javax.xml.bind:jaxb-api:${jaxbApiVersion}",
+            jaxb_runtime: "org.glassfish.jaxb:jaxb-runtime:${jaxbRuntimeVersion}",
+            jaxb_xjc: "org.glassfish.jaxb:jaxb-xjc:${jaxbRuntimeVersion}",
             // Note that jaxb2_basics is a set of tools on *top* of JAXB.
             // See https://github.com/highsource/jaxb2-basics
-            jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0',
-            jaxb2_basics_ant: 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0',
+            jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics:0.12.0',
+            jaxb2_basics_ant: 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.12.0',
 
             geolatte:       "org.geolatte:geolatte-geom:${geolatteVersion}",
 
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 4f9a755895..e2de3ae7b8 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -126,7 +126,9 @@ jar {
             'javax.enterprise.inject.spi;resolution:=optional',
             'javax.inject;resolution:=optional',
             'net.bytebuddy.*;resolution:=optional',
-            'javax.xml.bind.*'
+            // We must specify the version explicitly to allow Karaf
+            // to use an older version of JAXB (the only one we can use in Karaf)
+            "javax.xml.bind.*;version=\"${project.jaxbApiVersionOsgiRange}\""
 
 //        // TODO: Uncomment once EntityManagerFactoryBuilderImpl no longer
 //        // uses ClassLoaderServiceImpl.