From 08b32d5771109a4f6acb6efae93de7887268615f Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 21 Apr 2026 10:54:04 -0700 Subject: [PATCH] jakarta: Include tests in jacoco report This was already being done for servlet, so it was just copied to jakarta. --- servlet/jakarta/build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/servlet/jakarta/build.gradle b/servlet/jakarta/build.gradle index bcd904ccaee..5cd213949f4 100644 --- a/servlet/jakarta/build.gradle +++ b/servlet/jakarta/build.gradle @@ -122,6 +122,11 @@ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) { tasks.named("check").configure { dependsOn jetty11Test } + tasks.named("jacocoTestReport").configure { + // Must use executionData(Task...) override. The executionData(Object...) override doesn't + // find execution data correctly for tasks. + executionData jetty11Test.get() + } } if (JavaVersion.current().isJava11Compatible()) { def tomcat10Test = tasks.register('tomcat10Test', Test) { @@ -150,4 +155,9 @@ if (JavaVersion.current().isJava11Compatible()) { tasks.named("check").configure { dependsOn tomcat10Test, undertowTest } + tasks.named("jacocoTestReport").configure { + // Must use executionData(Task...) override. The executionData(Object...) override doesn't + // find execution data correctly for tasks. + executionData tomcat10Test.get(), undertowTest.get() + } }