Skip to content

Commit

Permalink
HHH-14640 Remove some JTA-related dependencies that weren't there in …
Browse files Browse the repository at this point in the history
…5.3.20.Final
  • Loading branch information
yrodiere authored and gbadner committed Jun 3, 2021
1 parent b3ae294 commit b95f589
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions hibernate-core/hibernate-core.gradle
Expand Up @@ -161,8 +161,13 @@ jar {
'org.apache.tools.ant.types;resolution:=optional',
'javax.inject;resolution:=optional',
'net.bytebuddy.*;resolution:=optional',
'org.objectweb.jonas_tm;resolution:=optional',
'com.ibm.websphere.jtaextensions;resolution:=optional',
// Remove JTA-related dependencies that weren't there in 5.3.0,
// 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
// to use an older version of JAXB (the only one we can use in Karaf)
"javax.xml.bind.*;version=\"${project.jaxbApiVersionOsgiRange}\"",
Expand Down

0 comments on commit b95f589

Please sign in to comment.