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

HHH-14640 Remove some JTA-related dependencies that weren't there in 5.3.20.Final

This commit is contained in:
Yoann Rodière 2021-05-31 08:47:35 +02:00 committed by gbadner
parent b3ae29406a
commit b95f589e08
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,8 +161,13 @@ jar {
'org.apache.tools.ant.types;resolution:=optional', 'org.apache.tools.ant.types;resolution:=optional',
'javax.inject;resolution:=optional', 'javax.inject;resolution:=optional',
'net.bytebuddy.*;resolution:=optional', 'net.bytebuddy.*;resolution:=optional',
'org.objectweb.jonas_tm;resolution:=optional', // Remove JTA-related dependencies that weren't there in 5.3.0,
'com.ibm.websphere.jtaextensions;resolution:=optional', // but were added after the switch to a different OSGi plugin.
// The dependencies *are* there in 5.4.x, but marked as optional.
// We're only removing them here as an extra cautious step
// to preserve backwards compatibility.
'!org.objectweb.jonas_tm',
'!com.ibm.websphere.jtaextensions',
// We must specify the version explicitly to allow Karaf // We must specify the version explicitly to allow Karaf
// to use an older version of JAXB (the only one we can use in Karaf) // to use an older version of JAXB (the only one we can use in Karaf)
"javax.xml.bind.*;version=\"${project.jaxbApiVersionOsgiRange}\"", "javax.xml.bind.*;version=\"${project.jaxbApiVersionOsgiRange}\"",