diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index d33d5410f1..8eefbfd494 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -114,22 +114,22 @@ dependencies {
 	if ( JavaVersion.current().isJava9Compatible() ) {
 		// The JDK used to run Gradle is Java 9+, and we assume that that is the same
 		//		JDK for executing tasks
-		compile( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
-		compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
-		compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
-		compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
-		compile( 'javax.annotation:jsr250-api:1.0' )
+		compile( libraries.jaxb )
+		compile( libraries.jaxb_xjc )
+		compile( libraries.jaxb2_basics )
+		compile( libraries.jaxb2_basics_ant )
+		compile( libraries.jsr250_api )
 
-		testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
-		testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
-		testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
-		testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
-		testCompile( 'javax.annotation:jsr250-api:1.0' )
+		testCompile( libraries.jaxb )
+		testCompile( libraries.jaxb_xjc )
+		testCompile( libraries.jaxb2_basics )
+		testCompile( libraries.jaxb2_basics_ant )
+		testCompile( libraries.jsr250_api )
 
-		testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
-		testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
-		testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
-		testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
+		testRuntime( libraries.jaxb )
+		testRuntime( libraries.jaxb_xjc )
+		testRuntime( libraries.jaxb2_basics )
+		testRuntime( libraries.jaxb2_basics_ant )
 	}
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/gradle/libraries.gradle b/gradle/libraries.gradle
index 52190ce0e3..097c0cb4a2 100644
--- a/gradle/libraries.gradle
+++ b/gradle/libraries.gradle
@@ -68,6 +68,7 @@ ext {
             interceptor:    'javax.interceptor:javax.interceptor-api:1.2',
             // required by JAXB from JDK 9 as it is not available anymore in JDK 9
             activation:     'javax.activation:javax.activation-api:1.2.0',
+            jsr250_api:     'javax.annotation:jsr250-api:1.0',
 
             // logging
             logging:        'org.jboss.logging:jboss-logging:3.3.2.Final',
@@ -75,11 +76,12 @@ ext {
             logging_processor:  'org.jboss.logging:jboss-logging-processor:2.1.0.Final',
 
             // jaxb task
-            jaxb:           'com.sun.xml.bind:jaxb-xjc:2.2.5',
-            jaxb2_basics:   'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.3',
-            jaxb2_ant:      'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.3',
-            jaxb2_jaxb:     'org.jvnet.jaxb2_commons:jaxb2-basics-jaxb:2.2.4-1',
-            jaxb2_jaxb_xjc: 'org.jvnet.jaxb2_commons:jaxb2-basics-jaxb-xjc:2.2.4-1',
+            jaxb: 'com.sun.xml.bind:jaxb-impl:2.2.11',
+            jaxb_xjc: 'org.glassfish.jaxb:jaxb-xjc:2.2.11',
+            // 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',
 
             geolatte:       "org.geolatte:geolatte-geom:${geolatteVersion}",
 
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 3025391aee..000015a2f4 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -27,12 +27,12 @@ dependencies {
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Java 9 ftw!
     if ( JavaVersion.current().isJava9Compatible() ) {
-        xjc( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
-        xjc( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
-        xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
-        xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
-        xjc( 'javax.activation:javax.activation-api:1.2.0' )
-        xjc( 'javax.annotation:jsr250-api:1.0' )
+        xjc( libraries.jaxb )
+        xjc( libraries.jaxb_xjc )
+        xjc( libraries.jaxb2_basics )
+        xjc( libraries.jaxb2_basics_ant )
+        xjc( libraries.activation )
+        xjc( libraries.jsr250_api )
     }
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle b/tooling/metamodel-generator/hibernate-jpamodelgen.gradle
index 3e4e57df26..91f86b9595 100644
--- a/tooling/metamodel-generator/hibernate-jpamodelgen.gradle
+++ b/tooling/metamodel-generator/hibernate-jpamodelgen.gradle
@@ -24,12 +24,12 @@ dependencies {
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Java 9 ftw!
 	if ( JavaVersion.current().isJava9Compatible() ) {
-		xjc( 'com.sun.xml.bind:jaxb-impl:2.2.11' )
-		xjc( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' )
-		xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' )
-		xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' )
-		xjc( 'javax.activation:javax.activation-api:1.2.0' )
-		xjc( 'javax.annotation:jsr250-api:1.0' )
+		xjc( libraries.jaxb )
+		xjc( libraries.jaxb_xjc )
+		xjc( libraries.jaxb2_basics )
+		xjc( libraries.jaxb2_basics_ant )
+		xjc( libraries.activation )
+		xjc( libraries.jsr250_api )
 	}
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~