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 36b7a339a5062f0fee7e72d26a9a212684cd63b8 Author: lprimak <[email protected]> AuthorDate: Mon Jan 19 19:24:25 2026 -0600 chore(3.x): problematic modules moved to the deferred profile for 3.x --- .mvn/maven.config | 2 ++ integration-tests/jaxrs/pom.xml | 9 ++++++++- integration-tests/pom.xml | 16 ++++++++++++---- pom.xml | 10 ++++++++++ samples/pom.xml | 19 ++++++++----------- support/pom.xml | 12 ++++++++++-- 6 files changed, 50 insertions(+), 18 deletions(-) diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000000000..6dc2f97ef --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,2 @@ +-Dskip.deferred.modules +-Djapicmp.skip=true diff --git a/integration-tests/jaxrs/pom.xml b/integration-tests/jaxrs/pom.xml index 107bfdb65..b537df69f 100644 --- a/integration-tests/jaxrs/pom.xml +++ b/integration-tests/jaxrs/pom.xml @@ -41,8 +41,15 @@ <!-- app servers --> <module>meecrowave</module> - <module>openliberty</module> </modules> + <profiles> + <profile> + <id>deferred-for-3x</id> + <modules> + <module>openliberty</module> + </modules> + </profile> + </profiles> </project> diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 7e11302ad..889018ac1 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -42,13 +42,9 @@ </properties> <modules> - <module>support</module> - <module>guice3</module> - <module>guice4</module> <module>meecrowave-support</module> <module>jaxrs</module> <module>jakarta-ee-support</module> - <module>jakarta-ee</module> </modules> <dependencyManagement> @@ -62,6 +58,18 @@ </dependencies> </dependencyManagement> + <profiles> + <profile> + <id>deferred-for-3x</id> + <modules> + <module>support</module> + <module>guice3</module> + <module>guice4</module> + <module>jakarta-ee</module> + </modules> + </profile> + </profiles> + <reporting> <plugins> <plugin> diff --git a/pom.xml b/pom.xml index d30c75501..bfd0764d4 100644 --- a/pom.xml +++ b/pom.xml @@ -346,6 +346,7 @@ <exclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</exclude> <exclude>**/spring.provides</exclude> <exclude>**/*.iml</exclude> + <exclude>**/*.idea/**</exclude> <exclude>**/target/**</exclude> <exclude>**/nb-configuration.xml</exclude> <exclude>**/faces-config.NavData</exclude> @@ -1514,6 +1515,7 @@ <exclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</exclude> <exclude>**/spring.provides</exclude> <exclude>**/*.iml</exclude> + <exclude>**/*.idea/**</exclude> <exclude>**/target/**</exclude> <exclude>**/nb-configuration.xml</exclude> <exclude>**/faces-config.NavData</exclude> @@ -1787,6 +1789,14 @@ </plugins> </build> </profile> + <profile> + <id>deferred-for-3x</id> + <activation> + <property> + <name>!skip.deferred.modules</name> + </property> + </activation> + </profile> </profiles> <!--Disable snapshot repositories because they download snapshots instead of using the current build in CI 'mvn verify' steps--> diff --git a/samples/pom.xml b/samples/pom.xml index 91e1d8ed2..8970d6045 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -41,26 +41,23 @@ <modules> <module>aspectj</module> <module>quickstart</module> - <module>web</module> <module>spring</module> - <module>spring-mvc</module> - <module>spring-hibernate</module> <module>spring-boot</module> - <module>spring-boot-web</module> - <module>guice</module> <module>quickstart-guice</module> - <module>servlet-plugin</module> - <module>web-jakarta</module> </modules> <profiles> <profile> - <id>jdk17plus</id> - <activation> - <jdk>[17,)</jdk> - </activation> + <id>deferred-for-3x</id> <modules> <module>spring-boot-3-web</module> + <module>spring-mvc</module> + <module>spring-hibernate</module> + <module>spring-boot-web</module> + <module>web</module> + <module>guice</module> + <module>servlet-plugin</module> + <module>web-jakarta</module> </modules> </profile> </profiles> diff --git a/support/pom.xml b/support/pom.xml index babbaa529..6a7d82e6a 100644 --- a/support/pom.xml +++ b/support/pom.xml @@ -37,13 +37,21 @@ <module>ehcache</module> <module>hazelcast</module> <module>quartz</module> - <module>spring</module> <module>guice</module> - <module>spring-boot</module> <module>servlet-plugin</module> <module>jaxrs</module> <module>features</module> <module>cdi</module> <module>jakarta-ee</module> </modules> + + <profiles> + <profile> + <id>deferred-for-3x</id> + <modules> + <module>spring</module> + <module>spring-boot</module> + </modules> + </profile> + </profiles> </project>
