This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit b7429c11dcf2f306fc3361e3ad6ea9717cc87a4e
Author: Thiago H. de Paula Figueiredo <thi...@arsmachina.com.br>
AuthorDate: Sat Mar 2 11:32:05 2024 -0300
TAP5-2741: exclude tapestry-spring from pre-Java 17 builds
---
build.gradle | 4 ++++
settings.gradle | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index e8d37a912..511ccee16 100755
--- a/build.gradle
+++ b/build.gradle
@@ -419,6 +419,10 @@ task aggregateJavadoc(type: Javadoc) {
addStringOption 'source', '8'
taglets "org.apache.tapestry5.javadoc.TapestryDocTaglet"
}
+
+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
+ exclude "org/apache/tapestry5/spring/**"
+ }
exclude "org/apache/tapestry5/internal/plastic/asm/**"
exclude "org/apache/tapestry5/internal/webresources/**"
diff --git a/settings.gradle b/settings.gradle
index bc0214947..ec6255986 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -33,13 +33,13 @@ buildCache {
}
include "plastic", "tapestry5-annotations", "tapestry-test", "tapestry-func",
"tapestry-ioc", "tapestry-json", "tapestry-http", "tapestry-core"
-include "tapestry-hibernate-core", "tapestry-hibernate", "tapestry-jmx",
"tapestry-upload", "tapestry-spring"
+include "tapestry-hibernate-core", "tapestry-hibernate", "tapestry-jmx",
"tapestry-upload"
include "tapestry-beanvalidator", "tapestry-jpa", "tapestry-kaptcha"
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
include "tapestry-javadoc"
}
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
- include "tapestry-latest-java-tests"
+ include "tapestry-latest-java-tests", "tapestry-spring"
}
include "quickstart", "tapestry-clojure", "tapestry-mongodb"
include "tapestry-test-data", 'tapestry-internal-test', "tapestry-ioc-junit"
