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
The following commit(s) were added to refs/heads/master by this push:
new 68fc38b95 TAP5-2809: Setting java toolchain in submodules where
required
68fc38b95 is described below
commit 68fc38b955725ef0674ae6d351c5e08cc2fb3710
Author: Ben Weidig <[email protected]>
AuthorDate: Sun Jan 25 13:53:59 2026 +0100
TAP5-2809: Setting java toolchain in submodules where required
---
tapestry-javadoc/build.gradle | 10 ----------
tapestry-latest-java-tests/build.gradle | 14 ++++++++++++--
tapestry-spring/build.gradle | 14 ++++++++++++--
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/tapestry-javadoc/build.gradle b/tapestry-javadoc/build.gradle
index 81baba6b0..153f7b790 100644
--- a/tapestry-javadoc/build.gradle
+++ b/tapestry-javadoc/build.gradle
@@ -14,17 +14,7 @@ dependencies {
testImplementation libs.spock.core
}
-java {
- toolchain {
- languageVersion = JavaLanguageVersion.of(11)
- }
-}
-
tasks.withType(JavaCompile).configureEach {
- // Override Java 8 compatibility inherited from root
- sourceCompatibility = '11'
- targetCompatibility = '11'
-
options.compilerArgs += [
'--add-modules',
'jdk.compiler'
diff --git a/tapestry-latest-java-tests/build.gradle
b/tapestry-latest-java-tests/build.gradle
index 6954db351..d4924c1fa 100644
--- a/tapestry-latest-java-tests/build.gradle
+++ b/tapestry-latest-java-tests/build.gradle
@@ -4,8 +4,18 @@ plugins {
description = 'Test suite for making sure Tapestry runs on latest Java'
-sourceCompatibility = '17'
-targetCompatibility = '17'
+
+java {
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(17)
+ }
+
+ withSourcesJar()
+}
+
+tasks.withType(JavaCompile).configureEach {
+ options.release = 17
+}
tasks.withType(JavaCompile).configureEach {
options.compilerArgs += '--enable-preview'
diff --git a/tapestry-spring/build.gradle b/tapestry-spring/build.gradle
index 9471f9d33..9d069604c 100644
--- a/tapestry-spring/build.gradle
+++ b/tapestry-spring/build.gradle
@@ -5,8 +5,18 @@ plugins {
description = 'Integration of Tapestry with the Spring Inversion Of Control
Container'
// Spring 6 requires Java 17
-sourceCompatibility = '17'
-targetCompatibility = '17'
+
+java {
+ toolchain {
+ languageVersion = JavaLanguageVersion.of(17)
+ }
+
+ withSourcesJar()
+}
+
+tasks.withType(JavaCompile).configureEach {
+ options.release = 17
+}
dependencies {
implementation project(':tapestry-core')
