This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch 3.x in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 95ce2a3d320f7495cc16e6f187ad3a73bc352de3 Merge: 2ffd610ff 8e1860a30 Author: lprimak <[email protected]> AuthorDate: Sun Feb 8 10:24:14 2026 -0600 Merge branch 'main' into 3.x .github/workflows/maven.yml | 2 +- pom.xml | 59 ++++++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --cc .github/workflows/maven.yml index 09dfbf7ee,c83680bc6..b5e3fa6bb --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@@ -54,8 -54,8 +54,8 @@@ jobs strategy: matrix: - os: [ 'ubuntu-latest', 'windows-2022', 'macOS-latest' ] + os: [ 'ubuntu-latest', 'windows-latest', 'macOS-latest' ] - jdk: [ 11, 17, 21, 25 ] + jdk: [ 17, 21, 25 ] dist: [ 'temurin', 'adopt-openj9', 'zulu' ] exclude: # was already built diff --cc pom.xml index eae546e8a,d4bca91ae..6b8b814b8 --- a/pom.xml +++ b/pom.xml @@@ -1782,47 -1875,31 +1783,49 @@@ </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> ++ ++<!-- TEMPORARY: Remove when https://github.com/mjeanroy/junit-servers is released to Maven Central--> + <profile> + <id>flowlogix-nexus-releases</id> + <repositories> + <repository> + <id>flowlogix-nexus-releases</id> + <name>Flowlogix Nexus Releases</name> + <url>https://nexus.flowlogix.com/repository/maven-releases/</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + </repositories> + </profile> </profiles> - <!--Disable snapshot repositories because they download snapshots - instead of using the current build in CI 'mvn verify' steps--> - <repositories> - <repository> - <id>apache.snapshots</id> - <url>https://repository.apache.org/snapshots</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>apache.snapshots</id> - <url>https://repository.apache.org/snapshots</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - </pluginRepositories> </project>
