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

HHH-12946 Use constants for JAXB dependencies instead of inline strings 

We may have to update these dependencies, let's make it easy.
This commit is contained in:
Yoann Rodière 2018-10-15 10:43:28 +02:00 committed by Guillaume Smet
parent a8e05fd409
commit 90c059aaa4
4 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gradle/java-module.gradle
View File

@ -114,22 +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( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) compile( libraries.jaxb )
compile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) compile( libraries.jaxb_xjc )
compile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) compile( libraries.jaxb2_basics )
compile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) compile( libraries.jaxb2_basics_ant )
compile( 'javax.annotation:jsr250-api:1.0' ) compile( libraries.jsr250_api )
testCompile( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) testCompile( libraries.jaxb )
testCompile( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) testCompile( libraries.jaxb_xjc )
testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) testCompile( libraries.jaxb2_basics )
testCompile( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) testCompile( libraries.jaxb2_basics_ant )
testCompile( 'javax.annotation:jsr250-api:1.0' ) testCompile( libraries.jsr250_api )
testRuntime( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) testRuntime( libraries.jaxb )
testRuntime( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) testRuntime( libraries.jaxb_xjc )
testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) testRuntime( libraries.jaxb2_basics )
testRuntime( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) testRuntime( libraries.jaxb2_basics_ant )
} }
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

12
gradle/libraries.gradle
View File

@ -68,6 +68,7 @@ ext {
interceptor: 'javax.interceptor:javax.interceptor-api:1.2', interceptor: 'javax.interceptor:javax.interceptor-api:1.2',
// required by JAXB from JDK 9 as it is not available anymore in JDK 9 // required by JAXB from JDK 9 as it is not available anymore in JDK 9
activation: 'javax.activation:javax.activation-api:1.2.0', activation: 'javax.activation:javax.activation-api:1.2.0',
jsr250_api: 'javax.annotation:jsr250-api:1.0',
// logging // logging
logging: 'org.jboss.logging:jboss-logging:3.3.2.Final', 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', logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final',
// jaxb task // jaxb task
jaxb: 'com.sun.xml.bind:jaxb-xjc:2.2.5', jaxb: 'com.sun.xml.bind:jaxb-impl:2.2.11',
jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.3', jaxb_xjc: 'org.glassfish.jaxb:jaxb-xjc:2.2.11',
jaxb2_ant: 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.3', // Note that jaxb2_basics is a set of tools on *top* of JAXB.
jaxb2_jaxb: 'org.jvnet.jaxb2_commons:jaxb2-basics-jaxb:2.2.4-1', // See https://github.com/highsource/jaxb2-basics
jaxb2_jaxb_xjc: 'org.jvnet.jaxb2_commons:jaxb2-basics-jaxb-xjc:2.2.4-1', 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}", geolatte: "org.geolatte:geolatte-geom:${geolatteVersion}",

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

@ -27,12 +27,12 @@ dependencies {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Java 9 ftw! // Java 9 ftw!
if ( JavaVersion.current().isJava9Compatible() ) { if ( JavaVersion.current().isJava9Compatible() ) {
xjc( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) xjc( libraries.jaxb )
xjc( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) xjc( libraries.jaxb_xjc )
xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) xjc( libraries.jaxb2_basics )
xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) xjc( libraries.jaxb2_basics_ant )
xjc( 'javax.activation:javax.activation-api:1.2.0' ) xjc( libraries.activation )
xjc( 'javax.annotation:jsr250-api:1.0' ) xjc( libraries.jsr250_api )
} }
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

@ -24,12 +24,12 @@ dependencies {
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Java 9 ftw! // Java 9 ftw!
if ( JavaVersion.current().isJava9Compatible() ) { if ( JavaVersion.current().isJava9Compatible() ) {
xjc( 'com.sun.xml.bind:jaxb-impl:2.2.11' ) xjc( libraries.jaxb )
xjc( 'org.glassfish.jaxb:jaxb-xjc:2.2.11' ) xjc( libraries.jaxb_xjc )
xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics:0.11.0' ) xjc( libraries.jaxb2_basics )
xjc( 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.11.0' ) xjc( libraries.jaxb2_basics_ant )
xjc( 'javax.activation:javax.activation-api:1.2.0' ) xjc( libraries.activation )
xjc( 'javax.annotation:jsr250-api:1.0' ) xjc( libraries.jsr250_api )
} }
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~