This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-tck.git
The following commit(s) were added to refs/heads/main by this push:
new 3d9aa4f Add jacoco plugin
3d9aa4f is described below
commit 3d9aa4f2443b1d57b069ae51b3224516352e0d5f
Author: remm <[email protected]>
AuthorDate: Tue Jul 30 15:16:26 2024 +0200
Add jacoco plugin
The exec data can then be fed to the Tomcat testsuite. The coverage does
increase in the expected places.
---
annotations-tck/pom.xml | 22 ++++++++++++++++++++++
el-tck/pom.xml | 22 ++++++++++++++++++++++
jsp-tck/pom.xml | 22 ++++++++++++++++++++++
pom.xml | 2 ++
servlet-tck/pom.xml | 22 ++++++++++++++++++++++
websocket-tck/pom.xml | 22 ++++++++++++++++++++++
6 files changed, 112 insertions(+)
diff --git a/annotations-tck/pom.xml b/annotations-tck/pom.xml
index 945cd87..24e0d56 100644
--- a/annotations-tck/pom.xml
+++ b/annotations-tck/pom.xml
@@ -60,6 +60,28 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/../../target/jacoco.exec</destFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/el-tck/pom.xml b/el-tck/pom.xml
index 5954e61..a9fbf45 100644
--- a/el-tck/pom.xml
+++ b/el-tck/pom.xml
@@ -67,6 +67,28 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/../../target/jacoco.exec</destFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/jsp-tck/pom.xml b/jsp-tck/pom.xml
index a19e488..154b722 100644
--- a/jsp-tck/pom.xml
+++ b/jsp-tck/pom.xml
@@ -102,6 +102,28 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/../../target/jacoco.exec</destFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 383d533..4994448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,8 @@
<!-- Tomcat TCK project dependencies-->
<download.maven.plugin.version>1.9.0</download.maven.plugin.version>
<maven.install.plugin.version>3.1.2</maven.install.plugin.version>
+ <jacoco.version>0.8.12</jacoco.version>
+ <jacoco.skip>true</jacoco.skip>
</properties>
<repositories>
diff --git a/servlet-tck/pom.xml b/servlet-tck/pom.xml
index 369868d..5e5023a 100644
--- a/servlet-tck/pom.xml
+++ b/servlet-tck/pom.xml
@@ -98,6 +98,28 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/../../target/jacoco.exec</destFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/websocket-tck/pom.xml b/websocket-tck/pom.xml
index a9a8e80..2d1841c 100644
--- a/websocket-tck/pom.xml
+++ b/websocket-tck/pom.xml
@@ -113,6 +113,28 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+
<destFile>${project.build.directory}/../../target/jacoco.exec</destFile>
+ </configuration>
+ </execution>
+ <execution>
+ <id>report</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
