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 32201b2ef2cdfe3eccd57e0029aa935d55d9c3ce Author: Lukasz Lenart <[email protected]> AuthorDate: Tue Sep 27 19:41:20 2022 +0200 WW-5232 Applies proper coverage settings for Jacoco plugin and Sonar --- apps/rest-showcase/pom.xml | 1 + apps/showcase/pom.xml | 1 + core/pom.xml | 4 +--- plugins/embeddedjsp/pom.xml | 1 + pom.xml | 5 ++++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index 870683b81..95bbbbf02 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -125,6 +125,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>@{argLine}</argLine> <excludes> <exclude>it/**</exclude> <exclude>**/*$*</exclude> diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 51b87ae26..18a7febc0 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -237,6 +237,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>@{argLine}</argLine> <excludes> <exclude>it/**</exclude> <exclude>**/*$*</exclude> 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/plugins/embeddedjsp/pom.xml b/plugins/embeddedjsp/pom.xml index 9da33bbc1..f76297bcc 100644 --- a/plugins/embeddedjsp/pom.xml +++ b/plugins/embeddedjsp/pom.xml @@ -97,6 +97,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <argLine>@{argLine}</argLine> <additionalClasspathElements> <element>${project.build.testOutputDirectory}/jsps.jar</element> </additionalClasspathElements> diff --git a/pom.xml b/pom.xml index 3ab070020..ff48f95f1 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> @@ -199,6 +201,7 @@ --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -Dillegal-access=permit + @{argLine} </argLine> </configuration> </plugin> @@ -264,7 +267,7 @@ </dependency> </dependencies> <configuration> - <argLine>-Duser.language=en -Duser.region=US</argLine> + <argLine>@{argLine}</argLine> <includes> <include>**/*Test.java</include> </includes>
