You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2021/05/27 14:01:35 UTC
[shiro] branch 1.8.x updated (358397b -> 1447e43)
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a change to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/shiro.git.
from 358397b Merge pull request #299 from apache/jenkins-matrix-1.8
add ce743aa Combine Spring Boot starters (web and non-web) into single module
add 9f8e5c6 Configure japicmp to work with new single spring boot starter
new 1447e43 Merge pull request #296 from apache/single-spring-1-8
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 5 +++
support/spring-boot/spring-boot-starter/pom.xml | 37 +++++++++++++++++
.../autoconfigure/ShiroWebAutoConfiguration.java | 2 +
.../autoconfigure/ShiroWebFilterConfiguration.java | 2 +
.../ShiroWebMvcAutoConfiguration.java | 2 +
.../additional-spring-configuration-metadata.json | 36 +++++++++++++++++
.../src/main/resources/META-INF/spring.factories | 3 ++
.../src/main/resources/META-INF/spring.provides | 2 +-
.../web/ConfiguredGlobalFiltersTest.groovy | 0
.../web/DisabledGlobalFiltersTest.groovy | 0
.../web/ShiroWebSpringAutoConfigurationTest.groovy | 0
.../ShiroWebAutoConfigurationTestApplication.java | 0
.../spring-boot/spring-boot-web-starter/pom.xml | 25 +++---------
.../src/main/resources/META-INF/NOTICE | 15 -------
.../additional-spring-configuration-metadata.json | 46 ----------------------
.../src/main/resources/META-INF/spring.factories | 4 --
.../src/main/resources/META-INF/spring.provides | 1 -
.../web/WebSpringFactoriesTest.groovy | 42 --------------------
18 files changed, 94 insertions(+), 128 deletions(-)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java (96%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java (94%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java (90%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ConfiguredGlobalFiltersTest.groovy (100%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/DisabledGlobalFiltersTest.groovy (100%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy (100%)
rename support/spring-boot/{spring-boot-web-starter => spring-boot-starter}/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java (100%)
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/NOTICE
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.factories
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.provides
delete mode 100644 support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/WebSpringFactoriesTest.groovy
[shiro] 01/01: Merge pull request #296 from apache/single-spring-1-8
Posted by bd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 1447e4329e786739863035dc1ed8480b73143f3b
Merge: 358397b 9f8e5c6
Author: Brian Demers <bd...@apache.org>
AuthorDate: Thu May 27 10:01:27 2021 -0400
Merge pull request #296 from apache/single-spring-1-8
Back port single spring boot module to 1.x
pom.xml | 5 +++
support/spring-boot/spring-boot-starter/pom.xml | 37 +++++++++++++++++
.../autoconfigure/ShiroWebAutoConfiguration.java | 2 +
.../autoconfigure/ShiroWebFilterConfiguration.java | 2 +
.../ShiroWebMvcAutoConfiguration.java | 2 +
.../additional-spring-configuration-metadata.json | 36 +++++++++++++++++
.../src/main/resources/META-INF/spring.factories | 3 ++
.../src/main/resources/META-INF/spring.provides | 2 +-
.../web/ConfiguredGlobalFiltersTest.groovy | 0
.../web/DisabledGlobalFiltersTest.groovy | 0
.../web/ShiroWebSpringAutoConfigurationTest.groovy | 0
.../ShiroWebAutoConfigurationTestApplication.java | 0
.../spring-boot/spring-boot-web-starter/pom.xml | 25 +++---------
.../src/main/resources/META-INF/NOTICE | 15 -------
.../additional-spring-configuration-metadata.json | 46 ----------------------
.../src/main/resources/META-INF/spring.factories | 4 --
.../src/main/resources/META-INF/spring.provides | 1 -
.../web/WebSpringFactoriesTest.groovy | 42 --------------------
18 files changed, 94 insertions(+), 128 deletions(-)