You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by be...@apache.org on 2025/08/24 10:01:41 UTC
(tapestry-5) branch gradle-improvements updated (515a71539 -> d81808aaa)
This is an automated email from the ASF dual-hosted git repository.
benw pushed a change to branch gradle-improvements
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
from 515a71539 If JS minifying fails, serve the file unchanged
new 5c886b9a0 TAP5-2809: fix webresources test
new 4fb466aca TAP5-2809: fix plastic tests that rely on Groovy quirks
new d81808aaa tapestry-ioc-jcache: try to make it work with Java 21
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tapestry5/plastic/FieldPropertyMethodCreation.groovy | 14 +++++++++-----
.../apache/tapestry5/plastic/MethodAnnotationAccess.groovy | 4 ++--
tapestry-ioc-jcache/build.gradle | 12 ++++++++++++
.../src/test/resources/META-INF/modules/index.coffee | 2 +-
4 files changed, 24 insertions(+), 8 deletions(-)
(tapestry-5) 02/03: TAP5-2809: fix plastic tests that rely on Groovy quirks
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benw pushed a commit to branch gradle-improvements
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 4fb466aca2dc183dd4f878ba539ea27f425ab824
Author: Ben Weidig <be...@netzgut.net>
AuthorDate: Sun Aug 24 12:01:04 2025 +0200
TAP5-2809: fix plastic tests that rely on Groovy quirks
---
.../tapestry5/plastic/FieldPropertyMethodCreation.groovy | 14 +++++++++-----
.../apache/tapestry5/plastic/MethodAnnotationAccess.groovy | 4 ++--
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldPropertyMethodCreation.groovy b/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldPropertyMethodCreation.groovy
index 62627d885..3a4fd3e3f 100644
--- a/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldPropertyMethodCreation.groovy
+++ b/plastic/src/test/groovy/org/apache/tapestry5/plastic/FieldPropertyMethodCreation.groovy
@@ -3,10 +3,12 @@ package org.apache.tapestry5.plastic
import spock.lang.Issue
import testannotations.Property
import testsubjects.AccessorsAlreadyExistSubject
-import testsubjects.AccessorsAlreadyExistSubject2;
+import testsubjects.AccessorsAlreadyExistSubject2
import testsubjects.CreateAccessorsSubject
import testsubjects.GenericCreateAccessorsSubject
+import java.lang.invoke.MethodType
+import java.lang.reflect.*
import java.util.concurrent.atomic.AtomicReference
class FieldPropertyMethodCreation extends AbstractPlasticSpecification
@@ -70,12 +72,10 @@ class FieldPropertyMethodCreation extends AbstractPlasticSpecification
assert o.refValue == "Plastic"
def get = o.class.getMethod("getRef")
- get.signature == "()Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/String;>;"
- get.genericInfo != null
+ getSignature(get) == "()Ljava/util/concurrent/atomic/AtomicReference;"
def set = o.class.getMethod("setRef", AtomicReference)
- set.signature == "(Ljava/util/concurrent/atomic/AtomicReference<Ljava/lang/String;>;)V"
- set.genericInfo != null
+ getSignature(set) == "(Ljava/util/concurrent/atomic/AtomicReference;)V"
}
def "create getter that already exists"() {
@@ -114,4 +114,8 @@ class FieldPropertyMethodCreation extends AbstractPlasticSpecification
assert e.message == "Unable to create new accessor method public void setValue(java.lang.String) on class testsubjects.AccessorsAlreadyExistSubject as the method is already implemented."
}
+
+ private def getSignature(Method m) {
+ MethodType.methodType(m.returnType, m.parameterTypes).toMethodDescriptorString()
+ }
}
diff --git a/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodAnnotationAccess.groovy b/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodAnnotationAccess.groovy
index baa11488a..33b2c5b61 100644
--- a/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodAnnotationAccess.groovy
+++ b/plastic/src/test/groovy/org/apache/tapestry5/plastic/MethodAnnotationAccess.groovy
@@ -20,7 +20,7 @@ class MethodAnnotationAccess extends AbstractPlasticSpecification {
then:
- methods.size == 2
+ methods.size() == 2
noMethod.description.methodName == "no"
yesMethod.description.methodName == "yes"
@@ -34,7 +34,7 @@ class MethodAnnotationAccess extends AbstractPlasticSpecification {
def methods = pc.getMethodsWithAnnotation(PrimitiveValues)
then:
- methods.size == 1
+ methods.size() == 1
when:
def pv = methods[0].getAnnotation(PrimitiveValues)
(tapestry-5) 03/03: tapestry-ioc-jcache: try to make it work with Java 21
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benw pushed a commit to branch gradle-improvements
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit d81808aaa96e43996f80ed68fb8faaeaceb39869
Author: Ben Weidig <be...@netzgut.net>
AuthorDate: Sun Aug 24 12:01:27 2025 +0200
tapestry-ioc-jcache: try to make it work with Java 21
---
tapestry-ioc-jcache/build.gradle | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tapestry-ioc-jcache/build.gradle b/tapestry-ioc-jcache/build.gradle
index cd0277613..72ead87c6 100644
--- a/tapestry-ioc-jcache/build.gradle
+++ b/tapestry-ioc-jcache/build.gradle
@@ -28,3 +28,15 @@ tasks.named('jar', Jar) {
attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.jcache.module.JCacheModule'
}
}
+
+
+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'
+ }
+}
\ No newline at end of file
(tapestry-5) 01/03: TAP5-2809: fix webresources test
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benw pushed a commit to branch gradle-improvements
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 5c886b9a044c95e3ac0f7672829d35adb12ec534
Author: Ben Weidig <be...@netzgut.net>
AuthorDate: Sun Aug 24 10:46:37 2025 +0200
TAP5-2809: fix webresources test
---
tapestry-webresources/src/test/resources/META-INF/modules/index.coffee | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tapestry-webresources/src/test/resources/META-INF/modules/index.coffee b/tapestry-webresources/src/test/resources/META-INF/modules/index.coffee
index 3b1d46a77..f1c1adf4b 100644
--- a/tapestry-webresources/src/test/resources/META-INF/modules/index.coffee
+++ b/tapestry-webresources/src/test/resources/META-INF/modules/index.coffee
@@ -1,3 +1,3 @@
require ["t5/core/dom"], (dom) ->
- (dom "banner").update "Index module loaded, bare!"
\ No newline at end of file
+ (dom.default("banner")).update "Index module loaded, bare!"
\ No newline at end of file