From ce743aa7bf9604e559b410d3fe33884010bbe680 Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Tue, 13 Apr 2021 11:23:29 -0400 Subject: [PATCH 1/2] Combine Spring Boot starters (web and non-web) into single module This mirrors the non-boot module (where the web bits are optional) *Conditionals are in place to NOT load the web related config * The previous module is still built, but just contains dependencies on the previous (and required servlet deps) --- pom.xml | 5 ++ .../spring-boot/spring-boot-starter/pom.xml | 10 ++++ .../ShiroWebAutoConfiguration.java | 2 + .../ShiroWebFilterConfiguration.java | 2 + .../ShiroWebMvcAutoConfiguration.java | 2 + ...itional-spring-configuration-metadata.json | 36 +++++++++++++++ .../main/resources/META-INF/spring.factories | 3 ++ .../main/resources/META-INF/spring.provides | 2 +- .../web/ConfiguredGlobalFiltersTest.groovy | 0 .../web/DisabledGlobalFiltersTest.groovy | 0 ...ShiroWebSpringAutoConfigurationTest.groovy | 0 ...roWebAutoConfigurationTestApplication.java | 0 .../spring-boot-web-starter/pom.xml | 19 -------- .../src/main/resources/META-INF/NOTICE | 15 ------ ...itional-spring-configuration-metadata.json | 46 ------------------- .../main/resources/META-INF/spring.factories | 4 -- .../main/resources/META-INF/spring.provides | 1 - .../web/WebSpringFactoriesTest.groovy | 42 ----------------- 18 files changed, 61 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 diff --git a/pom.xml b/pom.xml index 345dcb0710..a49c32afb3 100644 --- a/pom.xml +++ b/pom.xml @@ -1172,6 +1172,11 @@ spring-boot-test ${spring-boot.version} + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml index 855c71793d..a19c1fbeae 100644 --- a/support/spring-boot/spring-boot-starter/pom.xml +++ b/support/spring-boot/spring-boot-starter/pom.xml @@ -44,6 +44,16 @@ org.springframework.boot spring-boot-autoconfigure + + org.springframework.boot + spring-boot-starter-web + true + + + org.springframework + spring-webmvc + true + org.springframework.boot spring-boot-configuration-processor diff --git a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java similarity index 96% rename from support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java rename to support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java index 3b89b63334..49732ae2f1 100644 --- a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java +++ b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebAutoConfiguration.java @@ -41,6 +41,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -50,6 +51,7 @@ @Configuration @AutoConfigureBefore(ShiroAutoConfiguration.class) @AutoConfigureAfter(ShiroWebMvcAutoConfiguration.class) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnProperty(name = "shiro.web.enabled", matchIfMissing = true) public class ShiroWebAutoConfiguration extends AbstractShiroWebConfiguration { diff --git a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java similarity index 94% rename from support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java rename to support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java index 81a11ec718..05af40ccca 100644 --- a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java +++ b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebFilterConfiguration.java @@ -24,6 +24,7 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,6 +35,7 @@ * @since 1.4.0 */ @Configuration +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnProperty(name = "shiro.web.enabled", matchIfMissing = true) public class ShiroWebFilterConfiguration extends AbstractShiroWebFilterConfiguration { diff --git a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java similarity index 90% rename from support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java rename to support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java index 26fdeb775d..bd30c1b236 100644 --- a/support/spring-boot/spring-boot-web-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java +++ b/support/spring-boot/spring-boot-starter/src/main/java/org/apache/shiro/spring/config/web/autoconfigure/ShiroWebMvcAutoConfiguration.java @@ -21,6 +21,7 @@ import org.apache.shiro.spring.web.config.ShiroRequestMappingConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; @@ -28,5 +29,6 @@ @Configuration @ConditionalOnClass(RequestMappingHandlerMapping.class) @Import(ShiroRequestMappingConfig.class) +@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET) @ConditionalOnProperty(name = "shiro.web.enabled", matchIfMissing = true) public class ShiroWebMvcAutoConfiguration { } diff --git a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 3737aac1ea..5ef21158f5 100644 --- a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -11,6 +11,42 @@ "type": "java.lang.Boolean", "description": "A boolean flag that can disable all Shiro Spring Boot starters. This is mostly useful during testing or debugging, or if you want to compare behavior when Shiro is enabled or disabled.", "defaultValue": true + }, + { + "name": "shiro.web.enabled", + "type": "java.lang.Boolean", + "description": "A boolean flag that can disable all Shiro Spring Boot starters. This is mostly useful during testing or debugging, or if you want to compare behavior when Shiro is enabled or disabled.", + "defaultValue": true + }, + { + "name": "shiro.loginUrl", + "type": "java.lang.String", + "description": "The application's login URL to be assigned to all acquired Filters that subclass AccessControlFilter or 'null' if no value should be assigned globally.", + "defaultValue": "/login.jsp" + }, + { + "name": "shiro.successUrl", + "type": "java.lang.String", + "description": "The application's after-login success URL to be assigned to all acquired Filters that subclass AuthenticationFilter or null if no value should be assigned globally.", + "defaultValue": "/" + }, + { + "name": "shiro.unauthorizedUrl", + "type": "java.lang.String", + "description": "The application's 'unauthorized' URL to apply to as a convenience to all discovered AuthorizationFilter instances.", + "defaultValue": null + }, + { + "name": "shiro.sessionManager.sessionIdCookieEnabled", + "type": "java.lang.String", + "description": "Enable or disable session tracking via a cookie.", + "defaultValue": true + }, + { + "name": "shiro.sessionManager.sessionIdUrlRewritingEnabled", + "type": "java.lang.String", + "description": "Enable or disable session tracking via a URL parameter. If your site requires cookies, it is recommended you disable this.", + "defaultValue": true } ] } \ No newline at end of file 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 ac5e85676f..9743fcc7d2 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,4 +1,7 @@ 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 diff --git a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.provides b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.provides index 1749212347..d9b5251e74 100644 --- a/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.provides +++ b/support/spring-boot/spring-boot-starter/src/main/resources/META-INF/spring.provides @@ -1 +1 @@ -provides: shiro \ No newline at end of file +provides: shiro,shiro-web \ No newline at end of file diff --git a/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ConfiguredGlobalFiltersTest.groovy b/support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ConfiguredGlobalFiltersTest.groovy similarity index 100% rename from support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ConfiguredGlobalFiltersTest.groovy rename to support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ConfiguredGlobalFiltersTest.groovy diff --git a/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/DisabledGlobalFiltersTest.groovy b/support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/DisabledGlobalFiltersTest.groovy similarity index 100% rename from support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/DisabledGlobalFiltersTest.groovy rename to support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/DisabledGlobalFiltersTest.groovy diff --git a/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy b/support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy similarity index 100% rename from support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy rename to support/spring-boot/spring-boot-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/ShiroWebSpringAutoConfigurationTest.groovy diff --git a/support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java b/support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java similarity index 100% rename from support/spring-boot/spring-boot-web-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java rename to support/spring-boot/spring-boot-starter/src/test/java/org/apache/shiro/spring/boot/autoconfigure/web/application/ShiroWebAutoConfigurationTestApplication.java diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml index c34d80ef82..cf45dbee20 100644 --- a/support/spring-boot/spring-boot-web-starter/pom.xml +++ b/support/spring-boot/spring-boot-web-starter/pom.xml @@ -60,29 +60,10 @@ org.springframework.boot spring-boot-starter - ${spring-boot.version} org.springframework.boot spring-boot-starter-web - ${spring-boot.version} - - - - org.springframework.boot - spring-boot-test - test - - - org.springframework - spring-test - test - - - - org.mockito - mockito-core - test diff --git a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/NOTICE b/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/NOTICE deleted file mode 100644 index 9d26a95ffb..0000000000 --- a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,15 +0,0 @@ -Apache Shiro -Copyright 2008-2020 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version -available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. - -Certain parts (StringUtils, IpAddressMatcher, etc.) of the source -code for this product was copied for simplicity and to reduce -dependencies from the source code developed by the Spring Framework -Project (http://www.springframework.org). diff --git a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json deleted file mode 100644 index ff13832137..0000000000 --- a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "groups": [ - { - "name": "shiro" - } - ], - "properties": [ - - { - "name": "shiro.web.enabled", - "type": "java.lang.Boolean", - "description": "A boolean flag that can disable all Shiro Spring Boot starters. This is mostly useful during testing or debugging, or if you want to compare behavior when Shiro is enabled or disabled.", - "defaultValue": true - }, - { - "name": "shiro.loginUrl", - "type": "java.lang.String", - "description": "The application's login URL to be assigned to all acquired Filters that subclass AccessControlFilter or 'null' if no value should be assigned globally.", - "defaultValue": "/login.jsp" - }, - { - "name": "shiro.successUrl", - "type": "java.lang.String", - "description": "The application's after-login success URL to be assigned to all acquired Filters that subclass AuthenticationFilter or null if no value should be assigned globally.", - "defaultValue": "/" - }, - { - "name": "shiro.unauthorizedUrl", - "type": "java.lang.String", - "description": "The application's 'unauthorized' URL to apply to as a convenience to all discovered AuthorizationFilter instances.", - "defaultValue": null - }, - { - "name": "shiro.sessionManager.sessionIdCookieEnabled", - "type": "java.lang.String", - "description": "Enable or disable session tracking via a cookie.", - "defaultValue": true - }, - { - "name": "shiro.sessionManager.sessionIdUrlRewritingEnabled", - "type": "java.lang.String", - "description": "Enable or disable session tracking via a URL parameter. If your site requires cookies, it is recommended you disable this.", - "defaultValue": true - } - ] -} \ No newline at end of file diff --git a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.factories b/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 1546fc18cc..0000000000 --- a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,4 +0,0 @@ -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 diff --git a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.provides b/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.provides deleted file mode 100644 index ffe94a1d3a..0000000000 --- a/support/spring-boot/spring-boot-web-starter/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: shiro-web \ No newline at end of file diff --git a/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/WebSpringFactoriesTest.groovy b/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/WebSpringFactoriesTest.groovy deleted file mode 100644 index 491bc0a7fc..0000000000 --- a/support/spring-boot/spring-boot-web-starter/src/test/groovy/org/apache/shiro/spring/boot/autoconfigure/web/WebSpringFactoriesTest.groovy +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.shiro.spring.boot.autoconfigure.web - -import org.junit.Test - -import static org.hamcrest.MatcherAssert.assertThat -import static org.hamcrest.Matchers.matchesPattern -import static org.hamcrest.Matchers.not - -class WebSpringFactoriesTest { - - @Test - void springFactoriesConfigContainsNoWhitespace() { - Properties props = new Properties() - props.load(new FileReader("src/main/resources/META-INF/spring.factories")) - assertNoWhitespaceInEntries(props) - } - - static private assertNoWhitespaceInEntries(Properties props) { - props.each{ key, val -> - assertThat "Property [${key}] contains whitespace", - props.get("org.springframework.boot.autoconfigure.EnableAutoConfiguration"), not(matchesPattern(".*\\s.*")) - } - } -} From 9f8e5c6a5a7fc32b052b495c20b0fada0629f157 Mon Sep 17 00:00:00 2001 From: Brian Demers Date: Wed, 21 Apr 2021 23:30:57 -0400 Subject: [PATCH 2/2] Configure japicmp to work with new single spring boot starter --- .../spring-boot/spring-boot-starter/pom.xml | 27 +++++++++++++++++++ .../spring-boot-web-starter/pom.xml | 6 +++++ 2 files changed, 33 insertions(+) diff --git a/support/spring-boot/spring-boot-starter/pom.xml b/support/spring-boot/spring-boot-starter/pom.xml index a19c1fbeae..aaf7236970 100644 --- a/support/spring-boot/spring-boot-starter/pom.xml +++ b/support/spring-boot/spring-boot-starter/pom.xml @@ -86,4 +86,31 @@ + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + single-boot-jar + + cmp + + + + + + ${project.groupId} + shiro-spring-boot-web-starter + ${shiro.previousVersion} + jar + + + + + + + + diff --git a/support/spring-boot/spring-boot-web-starter/pom.xml b/support/spring-boot/spring-boot-web-starter/pom.xml index cf45dbee20..c897046870 100644 --- a/support/spring-boot/spring-boot-web-starter/pom.xml +++ b/support/spring-boot/spring-boot-web-starter/pom.xml @@ -31,6 +31,12 @@ shiro-spring-boot-web-starter Apache Shiro :: Support :: Spring Boot Web + Deprecated, these classes were moved to shiro-spring-boot-starter + + + + true +