This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5232-coverage
in repository https://gitbox.apache.org/repos/asf/struts.git
commit cef7b0d7f222338343cefe63543302e619b40782
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Tue Sep 27 19:41:20 2022 +0200
WW-5232 Applies proper coverage settings for Jacoco plugin and Sonar
---
core/pom.xml | 4 +---
pom.xml | 7 +++++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 71a3f777b..e8b92fbf2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -41,6 +41,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <argLine>@{argLine}</argLine>
<properties>
<property>
<name>maven.testng.output.dir</name>
@@ -54,9 +55,6 @@
<element>${project.build.testOutputDirectory}/xwork -
jar.jar</element>
<element>${project.build.testOutputDirectory}/xwork -
zip.zip</element>
</additionalClasspathElements>
- <includes>
- <include>**/*Test.java</include>
- </includes>
<excludes>
<exclude>**/XWorkTestCase.java</exclude>
<exclude>**/TestBean.java</exclude>
diff --git a/pom.xml b/pom.xml
index 3ab070020..bfda86e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,6 +130,8 @@
<sonar.organization>apache</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.exclusions>apps/**</sonar.exclusions>
+
+ <argLine>-Duser.language=en -Duser.country=US
-Duser.region=US</argLine>
</properties>
<profiles>
@@ -224,12 +226,13 @@
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
+ <goal>prepare-agent-integration</goal>
</goals>
</execution>
<execution>
<id>report</id>
<goals>
- <goal>report</goal>
+ <goal>report-aggregate</goal>
</goals>
<configuration>
<formats>
@@ -264,7 +267,7 @@
</dependency>
</dependencies>
<configuration>
- <argLine>-Duser.language=en -Duser.region=US</argLine>
+ <argLine>@{argLine}</argLine>
<includes>
<include>**/*Test.java</include>
</includes>
