Skip to content

Commit

Permalink
Use report-aggregate target for test artifacts
Browse files Browse the repository at this point in the history
  • Loading branch information
ppkarwasz committed Feb 24, 2024
1 parent 7ecfd43 commit 030c05d
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 0 deletions.
18 changes: 18 additions & 0 deletions log4j-api-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,24 @@
<build>
<plugins>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report-test-coverage</id>
<phase>none</phase>
</execution>
<execution>
<id>report-aggregate-test-coverage</id>
<goals>
<goal>report-aggregate</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
18 changes: 18 additions & 0 deletions log4j-core-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,24 @@
<build>
<plugins>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report-test-coverage</id>
<phase>none</phase>
</execution>
<execution>
<id>report-aggregate-test-coverage</id>
<goals>
<goal>report-aggregate</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>

<!-- Enable Log4j plugin processing -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
18 changes: 18 additions & 0 deletions log4j-layout-template-json-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,24 @@
<build>
<plugins>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report-test-coverage</id>
<phase>none</phase>
</execution>
<execution>
<id>report-aggregate-test-coverage</id>
<goals>
<goal>report-aggregate</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>

<!-- Modules that contain `log4j-core` plugins, must be compiled with: `org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor` -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
18 changes: 18 additions & 0 deletions log4j-osgi-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,24 @@
</executions>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>report-test-coverage</id>
<phase>none</phase>
</execution>
<execution>
<id>report-aggregate-test-coverage</id>
<goals>
<goal>report-aggregate</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,12 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<includes>
<include>org/apache/log4j/**</include>
<include>org/apache/logging/log4j/**</include>
</includes>
</configuration>
<executions>
<execution>
<id>prepare-jacoco-agent</id>
Expand Down

0 comments on commit 030c05d

Please sign in to comment.