This is an automated email from the ASF dual-hosted git repository. benweidig pushed a commit to branch javax in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit cd4880a8127b098d4ee7af860a36e1d4a85676ff Author: Ben Weidig <[email protected]> AuthorDate: Sun Apr 19 13:42:56 2026 +0200 minor fixes after cherry-picking master changes --- tapestry-core/build.gradle | 2 +- tapestry-hibernate-core/build.gradle | 2 +- tapestry-hibernate/build.gradle | 2 +- .../hibernate/web/internal/HibernateEntityValueEncoderTest.java | 2 +- tapestry-http/build.gradle | 2 +- .../org/apache/tapestry5/kaptcha/components/KaptchaUnitTest.java | 9 ++++++--- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle index 133bef559..9c52c8e57 100644 --- a/tapestry-core/build.gradle +++ b/tapestry-core/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation libs.commons.httpclient testImplementation project(':tapestry-spock') - testRuntimeOnly libs.hsqldb + testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8") } tasks.register('npmInstall', NpmTask) { diff --git a/tapestry-hibernate-core/build.gradle b/tapestry-hibernate-core/build.gradle index 60ef293d3..48aa01612 100644 --- a/tapestry-hibernate-core/build.gradle +++ b/tapestry-hibernate-core/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation libs.jaxb.runtime testImplementation project(':tapestry-test') - testRuntimeOnly libs.hsqldb + testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8") } jar { diff --git a/tapestry-hibernate/build.gradle b/tapestry-hibernate/build.gradle index a2a9d32d7..84ad1a2d3 100644 --- a/tapestry-hibernate/build.gradle +++ b/tapestry-hibernate/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation libs.jboss.logging testImplementation project(':tapestry-test') - testRuntimeOnly libs.hsqldb + testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8") } tasks.register('runTestApp0', JavaExec) { diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/web/internal/HibernateEntityValueEncoderTest.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/web/internal/HibernateEntityValueEncoderTest.java index 52f48974e..05b49237d 100644 --- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/web/internal/HibernateEntityValueEncoderTest.java +++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/web/internal/HibernateEntityValueEncoderTest.java @@ -109,7 +109,7 @@ public class HibernateEntityValueEncoderTest extends IOCTestCase { assertMessageContains( ex, - "Exception converting 'xyz' to instance of java.lang.Long (id type for entity org.apache.tapestry5.internal.hibernate.SampleEntity)"); + "Exception converting 'xyz' to instance of java.lang.Long (id type for entity org.apache.tapestry5.hibernate.web.internal.SampleEntity)"); } assertNull(encoder.toValue("")); diff --git a/tapestry-http/build.gradle b/tapestry-http/build.gradle index 1cbc9ec3e..c7dad5946 100644 --- a/tapestry-http/build.gradle +++ b/tapestry-http/build.gradle @@ -19,7 +19,7 @@ dependencies { testImplementation project(':tapestry-test') testImplementation project(':tapestry-test-constants') - testRuntimeOnly libs.hsqldb + testRuntimeOnly("${libs.hsqldb.get().module.group}:${libs.hsqldb.get().module.name}:${libs.hsqldb.get().version}:jdk8") testRuntimeOnly libs.slf4j.simple } diff --git a/tapestry-kaptcha/src/test/java/org/apache/tapestry5/kaptcha/components/KaptchaUnitTest.java b/tapestry-kaptcha/src/test/java/org/apache/tapestry5/kaptcha/components/KaptchaUnitTest.java index 3ea5d713f..87d756af2 100644 --- a/tapestry-kaptcha/src/test/java/org/apache/tapestry5/kaptcha/components/KaptchaUnitTest.java +++ b/tapestry-kaptcha/src/test/java/org/apache/tapestry5/kaptcha/components/KaptchaUnitTest.java @@ -17,21 +17,24 @@ import java.util.List; import org.apache.tapestry5.internal.test.TestableResponse; import org.apache.tapestry5.test.PageTester; -import org.junit.Test; +import org.testng.Assert; +import org.testng.annotations.Test; @Test(enabled = false) public class KaptchaUnitTest { @SuppressWarnings("unchecked") + @Test(enabled = false) public void cache_control_header() { PageTester tester = new PageTester("kaptcha.demo", "app"); final TestableResponse response = tester.renderPageAndReturnResponse("KaptchaDemo"); final List<String> headers = (List<String>) response.getHeaders("Cache-Control"); - assert "no-store, no-cache, must-revalidate".equals(headers.get(0)); - assert "post-check=0, pre-check=0".equals(headers.get(1)); + + Assert.assertEquals(headers.get(0), "no-store, no-cache, must-revalidate"); + Assert.assertEquals(headers.get(0), "post-check=0, pre-check=0"); } }
