This is an automated email from the ASF dual-hosted git repository. benw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 206367d40a68087c8a3fcdf2992703291c71bf0b Author: Ben Weidig <[email protected]> AuthorDate: Sun Apr 5 15:53:15 2026 +0200 TAP5-2825: tapestry-jpa-cache Java 21 support --- gradle/libs.versions.toml | 7 ++++--- tapestry-ioc-jcache/build.gradle | 16 +++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7c7f49d92..a818a00d6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -162,11 +162,12 @@ spring-websocket = { module = "org.springframework:spring-websocket", version.re # IOC JCACHE -javax-cache-api = { module = "javax.cache:cache-api", version.ref = "javax-cache" } -javax-cache-tests = { module = "javax.cache:cache-tests", version.ref = "javax-cache" } +javax-cache-api = { module = "javax.cache:cache-api", version.ref = "javax-cache" } +javax-cache-tests = { module = "javax.cache:cache-tests", version.ref = "javax-cache" } javax-cache-test-domain = { module = "javax.cache:test-domain", version.ref = "javax-cache" } + cache-annotations = { module = "org.jsr107.ri:cache-annotations-ri-common", version.ref = "javax-cache" } -infinispan-jcache = { module = "org.infinispan:infinispan-jcache", version.ref = "infinispan-jcache" } +cache-ri-impl = { module = "org.jsr107.ri:cache-ri-impl", version.ref = "javax-cache" } # WEBRESOURCES diff --git a/tapestry-ioc-jcache/build.gradle b/tapestry-ioc-jcache/build.gradle index 81897ad15..e698d7158 100644 --- a/tapestry-ioc-jcache/build.gradle +++ b/tapestry-ioc-jcache/build.gradle @@ -12,7 +12,7 @@ dependencies { testImplementation libs.javax.cache.tests testImplementation libs.javax.cache.test.domain - testRuntimeOnly libs.infinispan.jcache /* Just to be able to run the tests */ + testRuntimeOnly libs.cache.ri.impl /* Just to be able to run the tests */ } tasks.named('jar', Jar) { @@ -22,12 +22,10 @@ tasks.named('jar', Jar) { } test { - if (JavaVersion.current().isJava9Compatible()) { - jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED' - jvmArgs '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED' - jvmArgs '--add-opens', 'java.base/java.io=ALL-UNNAMED' - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' - jvmArgs '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED' - jvmArgs '--add-opens', 'java.base/java.lang.reflect=ALL-UNNAMED' - } + jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED' + jvmArgs '--add-opens', 'java.base/java.util.concurrent=ALL-UNNAMED' + jvmArgs '--add-opens', 'java.base/java.io=ALL-UNNAMED' + jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + jvmArgs '--add-opens', 'java.base/java.lang.invoke=ALL-UNNAMED' + jvmArgs '--add-opens', 'java.base/java.lang.reflect=ALL-UNNAMED' }
