You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2022/02/12 03:18:03 UTC
[tapestry-5] branch latest-java-tests updated: TAP5-2700: trying to fix JaCoCo, 3rd attempt
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch latest-java-tests
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/latest-java-tests by this push:
new 35c9634 TAP5-2700: trying to fix JaCoCo, 3rd attempt
35c9634 is described below
commit 35c9634b80657358761a61c792e14738ed62f987
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Sat Feb 12 00:17:41 2022 -0300
TAP5-2700: trying to fix JaCoCo, 3rd attempt
---
build.gradle | 2 +-
tapestry-core/build.gradle | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 309bd92..8aaa360 100755
--- a/build.gradle
+++ b/build.gradle
@@ -446,7 +446,7 @@ task combinedJacocoReport(type:JacocoReport){
additionalSourceDirs.from(files(subprojectsToConsider.sourceSets.main.allSource.srcDirs))
sourceDirectories.from(files(subprojectsToConsider.sourceSets.main.allSource.srcDirs))
classDirectories.from(files(subprojectsToConsider.sourceSets.main.output))
- executionData.from(files(subprojectsToConsider.jacocoTestReport.executionData).findAll { it.exists() })
+ executionData.from(files(subprojectsToConsider.jacocoTestReport.executionData).filter { it.exists() })
jacocoClasspath = files(subprojectsToConsider.jacocoTestReport.jacocoClasspath)
reports {
html {
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index 559dbec..b2093cf 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -74,7 +74,9 @@ jar {
// Needed to have XMLTokenStreamTests.testStreamEncoding() passing on Java 17
test {
- jvmArgs '--add-opens=java.base/java.nio.charset=ALL-UNNAMED'
+ if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+ jvmArgs("--add-opens=java.base/java.nio.charset=ALL-UNNAMED");
+ }
}
task runTestApp1(type:JavaExec) {