From b95f589e08d55c6a910c236d3bd445df09fd5967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 31 May 2021 08:47:35 +0200 Subject: [PATCH] HHH-14640 Remove some JTA-related dependencies that weren't there in 5.3.20.Final --- hibernate-core/hibernate-core.gradle | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle index f5d824d9d865..471e6dd6a596 100644 --- a/hibernate-core/hibernate-core.gradle +++ b/hibernate-core/hibernate-core.gradle @@ -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}\"",