This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 8e1860a30b17f0fd355d03bcb2809f6458de07a0 Author: lprimak <[email protected]> AuthorDate: Sun Feb 8 10:05:23 2026 -0600 chore(build): using latest Windows build and workarounds for https://github.com/apache/maven-surefire/issues/3176 --- .github/workflows/maven.yml | 2 +- pom.xml | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0b9c5039d..c83680bc6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -54,7 +54,7 @@ jobs: strategy: matrix: - os: [ 'ubuntu-latest', 'windows-2022', 'macOS-latest' ] + os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ] jdk: [ 11, 17, 21, 25 ] dist: [ 'temurin', 'adopt-openj9', 'zulu' ] exclude: diff --git a/pom.xml b/pom.xml index 20670525a..d4bca91ae 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ <surefire.argLine/> <!--suppress CheckTagEmptyBody --> <failsafe.argLine/> + <argLine/> <junit5.parallel.tests.enabled>true</junit5.parallel.tests.enabled> <junit5.parallel.tests.mode>concurrent</junit5.parallel.tests.mode> <nexus.deploy.skip>false</nexus.deploy.skip> @@ -278,7 +279,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-XX:+IgnoreUnrecognizedVMOptions @{jacocoAgent} @{surefire.argLine} -Xshare:off</argLine> + <argLine>@{argLine} -XX:+IgnoreUnrecognizedVMOptions @{jacocoAgent} @{surefire.argLine} -Xshare:off</argLine> <shutdown>kill</shutdown> <enableProcessChecker>native</enableProcessChecker> <trimStackTrace>false</trimStackTrace> @@ -295,7 +296,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <configuration> - <argLine>-XX:+IgnoreUnrecognizedVMOptions @{jacocoAgent} @{failsafe.argLine}</argLine> + <argLine>@{argLine} -XX:+IgnoreUnrecognizedVMOptions @{jacocoAgent} @{failsafe.argLine}</argLine> <trimStackTrace>false</trimStackTrace> <redirectTestOutputToFile>true</redirectTestOutputToFile> </configuration> @@ -1874,5 +1875,31 @@ </plugins> </build> </profile> + <profile> + <id>windows-tests</id> + <activation> + <os> + <family>Windows</family> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <enableProcessChecker>ping</enableProcessChecker> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <configuration> + <enableProcessChecker>ping</enableProcessChecker> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>
