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

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.
This commit is contained in:
Yoann Rodière 2018-11-23 10:08:15 +01:00 committed by Guillaume Smet
parent 809eec87f0
commit aa2648d878
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gradle/libraries.gradle
View File

@ -36,6 +36,11 @@ ext {
jodaTimeVersion = '2.3' 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 = [ libraries = [
// Ant // Ant
ant: 'org.apache.ant:ant:1.8.2', 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', logging_processor: 'org.jboss.logging:jboss-logging-processor:2.1.0.Final',
// jaxb task // jaxb task
// Strangely, jaxb-runtime 2.2.11 depends on jaxb-api 2.2.12-b140109.1041 jaxb_api: "javax.xml.bind:jaxb-api:${jaxbApiVersion}",
jaxb_api: 'javax.xml.bind:jaxb-api:2.2.12-b140109.1041', jaxb_runtime: "org.glassfish.jaxb:jaxb-runtime:${jaxbRuntimeVersion}",
jaxb_runtime: 'org.glassfish.jaxb:jaxb-runtime:2.2.11', jaxb_xjc: "org.glassfish.jaxb:jaxb-xjc:${jaxbRuntimeVersion}",
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
jaxb2_basics: 'org.jvnet.jaxb2_commons:jaxb2-basics: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.11.0', jaxb2_basics_ant: 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.12.0',
geolatte: "org.geolatte:geolatte-geom:${geolatteVersion}", geolatte: "org.geolatte:geolatte-geom:${geolatteVersion}",

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

@ -126,7 +126,9 @@ jar {
'javax.enterprise.inject.spi;resolution:=optional', 'javax.enterprise.inject.spi;resolution:=optional',
'javax.inject;resolution:=optional', 'javax.inject;resolution:=optional',
'net.bytebuddy.*;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 // // TODO: Uncomment once EntityManagerFactoryBuilderImpl no longer
// // uses ClassLoaderServiceImpl. // // uses ClassLoaderServiceImpl.