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 1adaf0dee1a1fed8b244a97142d5eca062837551 Author: Ben Weidig <[email protected]> AuthorDate: Sat Apr 4 15:26:45 2026 +0200 TAP5-2809: jacoco 0.8.14, version guards removed --- build.gradle | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index cfa3c0394..b174ebceb 100755 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ subprojects { plugins.apply 'groovy' jacoco { - toolVersion = '0.8.7' + toolVersion = '0.8.14' } dependencies { @@ -245,10 +245,6 @@ tasks.register('aggregateJavadoc', Javadoc) { def allMainJavaFiles = allMainSourceSets*.java def allMainJavaSrcDirs = allMainJavaFiles*.srcDirs - 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/**' exclude 'org/apache/tapestry5/webresources/modules/**' @@ -268,22 +264,18 @@ tasks.register('aggregateJavadoc', Javadoc) { docTitle "Tapestry API - ($project.version)" bottom "${project.version} - Copyright © 2003-${thisYear} <a href=\"http://tapestry.apache.org/\";>The Apache Software Foundation</a>." setUse(use) - links 'https://docs.oracle.com/javase/8/docs/api/' + links 'https://docs.oracle.com/en/java/javase/11/docs/api/' + + tagletPath Collections.unmodifiableList(new ArrayList<>((Set) configurations.javadoc.files)) - if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11)) { - tagletPath Collections.unmodifiableList(new ArrayList<>((Set) configurations.javadoc.files)) - } // Uncomment jFlags to debug `./gradlew aggregateJavadoc` // jFlags '-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005' addStringOption '-source-path', files(allMainJavaSrcDirs.flatten()).asPath - addStringOption 'source', '8' + addStringOption 'source', '11' taglets 'org.apache.tapestry5.javadoc.TapestryDocTaglet' - // Javadoc became stricer, so lets do this to actually build for now - if (JavaVersion.current().isJava9Compatible()) { - addBooleanOption('html5', true) - addStringOption('Xdoclint:none', '-quiet') - } + addBooleanOption('html5', true) + addStringOption('Xdoclint:none', '-quiet') } // As part of generating the documentation, ALSO copy any related files:
