From 240a95b5518a0d5eaf90ddb414d15696f6cd796b Mon Sep 17 00:00:00 2001 From: Mats - ToetMats Date: Tue, 23 Sep 2025 15:10:44 +0000 Subject: [PATCH 1/2] Bump jakarta xml bind api to 4.0+ --- ehcache-xml/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ehcache-xml/build.gradle b/ehcache-xml/build.gradle index 64ac2910a8..9971dcd9f3 100644 --- a/ehcache-xml/build.gradle +++ b/ehcache-xml/build.gradle @@ -105,7 +105,7 @@ dependencies { api 'javax.xml.bind:jaxb-api:[2.2,3)' runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:[2.2,3)' - jakartaApi 'jakarta.xml.bind:jakarta.xml.bind-api:[3,4)' + jakartaApi 'jakarta.xml.bind:jakarta.xml.bind-api:[3,4.1)' jakartaRuntimeOnly 'org.glassfish.jaxb:jaxb-runtime:[3,3.1)' testFixturesApi 'org.xmlunit:xmlunit-core:2.6.0', 'org.xmlunit:xmlunit-matchers:2.6.0' From 7501fc27d0b408e1b06c775e03897dfaf0209aef Mon Sep 17 00:00:00 2001 From: Mats - ToetMats Date: Fri, 26 Sep 2025 11:46:29 +0000 Subject: [PATCH 2/2] Bump remainding xml bind dependencies --- ehcache-xml/build.gradle | 2 +- ehcache/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ehcache-xml/build.gradle b/ehcache-xml/build.gradle index 9971dcd9f3..0470d89c7e 100644 --- a/ehcache-xml/build.gradle +++ b/ehcache-xml/build.gradle @@ -131,7 +131,7 @@ tasks.named('jakartaJar', Jar) { bundle { bnd ( 'Export-Package': 'org.ehcache.xml.*', - 'Import-Package': "jakarta.xml.bind*;version=\"[3,4)\", *" + 'Import-Package': "jakarta.xml.bind*;version=\"[3,4.1)\", *" ) } } diff --git a/ehcache/build.gradle b/ehcache/build.gradle index 1dfba7def1..f60725e897 100644 --- a/ehcache/build.gradle +++ b/ehcache/build.gradle @@ -101,7 +101,7 @@ dependencies { javadocAdd 'javax.xml.bind:jaxb-api:[2.2,3)' jakartaJavadocAdd 'com.github.spotbugs:spotbugs-annotations:4.2.3' - jakartaJavadocAdd 'jakarta.xml.bind:jakarta.xml.bind-api:[3,4)' + jakartaJavadocAdd 'jakarta.xml.bind:jakarta.xml.bind-api:[3,4.1)' } @@ -112,7 +112,7 @@ tasks.named('jakartaJar') { instruction Constants.BUNDLE_DESCRIPTION, 'Ehcache is an open-source caching library, compliant with the JSR-107 standard.' instruction Constants.BUNDLE_ACTIVATOR, 'org.ehcache.core.osgi.EhcacheActivator' instruction Constants.EXPORT_PACKAGE, '!org.ehcache.jsr107.tck, !org.ehcache.*.internal.*, org.ehcache.*' - instruction Constants.IMPORT_PACKAGE, 'javax.annotation.*;resolution:=optional, javax.cache.*;resolution:=optional, jdk.internal.misc;resolution:=optional, !javax.annotation, !sun.misc, jakarta.xml.bind*;version="[3,4)", *' + instruction Constants.IMPORT_PACKAGE, 'javax.annotation.*;resolution:=optional, javax.cache.*;resolution:=optional, jdk.internal.misc;resolution:=optional, !javax.annotation, !sun.misc, jakarta.xml.bind*;version="[3,4.1)", *' } }