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
The following commit(s) were added to refs/heads/main by this push:
new f3142b7db deps: Updated Spring configurations as per their Migration
Guide
new ba31e4467 Merge pull request #1000 from
lprimak/spring-autoconfig-updates
f3142b7db is described below
commit f3142b7dbed81f19b64360ca2358ff6c2f9dc4e7
Author: lprimak <[email protected]>
AuthorDate: Sun Jul 2 14:30:48 2023 -0500
deps: Updated Spring configurations as per their Migration Guide
---
pom.xml | 2 ++
.../src/main/resources/META-INF/spring.factories | 8 --------
...g.springframework.boot.autoconfigure.AutoConfiguration.imports | 6 ++++++
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index c037950f2..e39bcb18c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -337,6 +337,7 @@
<exclude>README.md</exclude>
<exclude>**/*.json</exclude>
<exclude>**/spring.factories</exclude>
+
<exclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</exclude>
<exclude>**/spring.provides</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/target/**</exclude>
@@ -1554,6 +1555,7 @@
<exclude>README.md</exclude>
<exclude>**/*.json</exclude>
<exclude>**/spring.factories</exclude>
+
<exclude>**/org.springframework.boot.autoconfigure.AutoConfiguration.imports</exclude>
<exclude>**/spring.provides</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/target/**</exclude>
diff --git
a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.factories
b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.factories
index 9a94d5afa..42451ea18 100644
---
a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.factories
+++
b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -1,11 +1,3 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration = \
- org.apache.shiro.spring.config.web.autoconfigure.ShiroWebAutoConfiguration,\
-
org.apache.shiro.spring.config.web.autoconfigure.ShiroWebFilterConfiguration,\
-
org.apache.shiro.spring.config.web.autoconfigure.ShiroWebMvcAutoConfiguration,\
- org.apache.shiro.spring.boot.autoconfigure.ShiroBeanAutoConfiguration,\
- org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfiguration,\
-
org.apache.shiro.spring.boot.autoconfigure.ShiroAnnotationProcessorAutoConfiguration
-
org.springframework.boot.diagnostics.FailureAnalyzer = \
org.apache.shiro.spring.boot.autoconfigure.ShiroNoRealmConfiguredFailureAnalyzer
diff --git
a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 000000000..c575b2d4b
--- /dev/null
+++
b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,6 @@
+org.apache.shiro.spring.config.web.autoconfigure.ShiroWebAutoConfiguration
+org.apache.shiro.spring.config.web.autoconfigure.ShiroWebFilterConfiguration
+org.apache.shiro.spring.config.web.autoconfigure.ShiroWebMvcAutoConfiguration
+org.apache.shiro.spring.boot.autoconfigure.ShiroBeanAutoConfiguration
+org.apache.shiro.spring.boot.autoconfigure.ShiroAutoConfiguration
+org.apache.shiro.spring.boot.autoconfigure.ShiroAnnotationProcessorAutoConfiguration
\ No newline at end of file
