Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12946 Add explicit dependencies to JAXB APIs where relevant

This commit is contained in:
Yoann Rodière 2018-10-15 11:10:39 +02:00 committed by Guillaume Smet
parent fcdc62a849
commit f9609f93b2
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gradle/java-module.gradle
View File

@ -114,19 +114,22 @@ dependencies {
if ( JavaVersion.current().isJava9Compatible() ) { if ( JavaVersion.current().isJava9Compatible() ) {
// The JDK used to run Gradle is Java 9+, and we assume that that is the same // The JDK used to run Gradle is Java 9+, and we assume that that is the same
// JDK for executing tasks // JDK for executing tasks
compile( libraries.jaxb ) compile( libraries.jaxb_api )
compile( libraries.jaxb_runtime )
compile( libraries.jaxb_xjc ) compile( libraries.jaxb_xjc )
compile( libraries.jaxb2_basics ) compile( libraries.jaxb2_basics )
compile( libraries.jaxb2_basics_ant ) compile( libraries.jaxb2_basics_ant )
compile( libraries.jsr250_api ) compile( libraries.jsr250_api )
testCompile( libraries.jaxb ) testCompile( libraries.jaxb_api )
testCompile( libraries.jaxb_runtime )
testCompile( libraries.jaxb_xjc ) testCompile( libraries.jaxb_xjc )
testCompile( libraries.jaxb2_basics ) testCompile( libraries.jaxb2_basics )
testCompile( libraries.jaxb2_basics_ant ) testCompile( libraries.jaxb2_basics_ant )
testCompile( libraries.jsr250_api ) testCompile( libraries.jsr250_api )
testRuntime( libraries.jaxb ) testRuntime( libraries.jaxb_api )
testRuntime( libraries.jaxb_runtime )
testRuntime( libraries.jaxb_xjc ) testRuntime( libraries.jaxb_xjc )
testRuntime( libraries.jaxb2_basics ) testRuntime( libraries.jaxb2_basics )
testRuntime( libraries.jaxb2_basics_ant ) testRuntime( libraries.jaxb2_basics_ant )

4
gradle/libraries.gradle
View File

@ -76,7 +76,9 @@ ext {
logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final', logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final',
// jaxb task // jaxb task
jaxb: 'org.glassfish.jaxb:jaxb-runtime:2.2.11', // 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_xjc: 'org.glassfish.jaxb:jaxb-xjc:2.2.11',
// Note that jaxb2_basics is a set of tools on *top* of JAXB. // Note that jaxb2_basics is a set of tools on *top* of JAXB.
// See https://github.com/highsource/jaxb2-basics // See https://github.com/highsource/jaxb2-basics

2
hibernate-core/hibernate-core.gradle
View File

@ -27,7 +27,7 @@ dependencies {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Java 9 ftw! // Java 9 ftw!
if ( JavaVersion.current().isJava9Compatible() ) { if ( JavaVersion.current().isJava9Compatible() ) {
xjc( libraries.jaxb ) xjc( libraries.jaxb_runtime )
xjc( libraries.jaxb_xjc ) xjc( libraries.jaxb_xjc )
xjc( libraries.jaxb2_basics ) xjc( libraries.jaxb2_basics )
xjc( libraries.jaxb2_basics_ant ) xjc( libraries.jaxb2_basics_ant )

2
tooling/metamodel-generator/hibernate-jpamodelgen.gradle
View File

@ -24,7 +24,7 @@ dependencies {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Java 9 ftw! // Java 9 ftw!
if ( JavaVersion.current().isJava9Compatible() ) { if ( JavaVersion.current().isJava9Compatible() ) {
xjc( libraries.jaxb ) xjc( libraries.jaxb_runtime )
xjc( libraries.jaxb_xjc ) xjc( libraries.jaxb_xjc )
xjc( libraries.jaxb2_basics ) xjc( libraries.jaxb2_basics )
xjc( libraries.jaxb2_basics_ant ) xjc( libraries.jaxb2_basics_ant )