Skip to content

Commit 79ae5a9

Browse files
committed
Move management web security concerns to spring-security module
Issue: 46133
1 parent 1c4d4a6 commit 79ae5a9

File tree

52 files changed

+131
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+131
-126
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
plugins {
1919
id "java-library"
20-
id "org.springframework.boot.auto-configuration"
2120
id "org.springframework.boot.deployed"
2221
id "org.springframework.boot.optional-dependencies"
2322
}
@@ -58,7 +57,7 @@ dependencies {
5857
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
5958
testImplementation(project(":spring-boot-project:spring-boot-webflux"))
6059
testImplementation("org.springframework.security:spring-security-test")
61-
60+
6261
testRuntimeOnly("ch.qos.logback:logback-classic")
6362
}
6463

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

Lines changed: 0 additions & 1 deletion
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 0 additions & 2 deletions
This file was deleted.

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/JerseyEndpointIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
import org.springframework.boot.actuate.autoconfigure.beans.BeansEndpointAutoConfiguration;
2929
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
3030
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
31-
import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
3231
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
3332
import org.springframework.boot.autoconfigure.AutoConfigurations;
3433
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3534
import org.springframework.boot.jersey.autoconfigure.JerseyAutoConfiguration;
35+
import org.springframework.boot.security.actuate.autoconfigure.servlet.ManagementWebSecurityAutoConfiguration;
3636
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
3737
import org.springframework.boot.test.context.FilteredClassLoader;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/resources/org/springframework/boot/actuate/autoconfigure/security/servlet/saml-certificate

Lines changed: 0 additions & 24 deletions
This file was deleted.

spring-boot-project/spring-boot-docs/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ plugins.withType(EclipsePlugin) {
7777
dependencies {
7878
autoConfiguration(project(path: ":spring-boot-project:spring-boot-activemq", configuration: "autoConfigurationMetadata"))
7979
autoConfiguration(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "autoConfigurationMetadata"))
80-
autoConfiguration(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure-all", configuration: "autoConfigurationMetadata"))
8180
autoConfiguration(project(path: ":spring-boot-project:spring-boot-amqp", configuration: "autoConfigurationMetadata"))
8281
autoConfiguration(project(path: ":spring-boot-project:spring-boot-artemis", configuration: "autoConfigurationMetadata"))
8382
autoConfiguration(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "autoConfigurationMetadata"))
@@ -248,7 +247,6 @@ dependencies {
248247

249248
implementation(project(path: ":spring-boot-project:spring-boot-actuator"))
250249
implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure"))
251-
implementation(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure-all"))
252250
implementation(project(path: ":spring-boot-project:spring-boot-amqp"))
253251
implementation(project(path: ":spring-boot-project:spring-boot-cache"))
254252
implementation(project(path: ":spring-boot-project:spring-boot-data-cassandra"))

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/exposeall/MySecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.actuator.endpoints.security.exposeall;
1818

19-
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
19+
import org.springframework.boot.security.actuate.autoconfigure.servlet.EndpointRequest;
2020
import org.springframework.context.annotation.Bean;
2121
import org.springframework.context.annotation.Configuration;
2222
import org.springframework.security.config.annotation.web.builders.HttpSecurity;

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/actuator/endpoints/security/typical/MySecurityConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.actuator.endpoints.security.typical;
1818

19-
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest;
19+
import org.springframework.boot.security.actuate.autoconfigure.servlet.EndpointRequest;
2020
import org.springframework.context.annotation.Bean;
2121
import org.springframework.context.annotation.Configuration;
2222
import org.springframework.security.config.annotation.web.builders.HttpSecurity;

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/security/exposeall/MySecurityConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.actuator.endpoints.security.exposeall
1818

19-
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest
19+
import org.springframework.boot.security.actuate.autoconfigure.servlet.EndpointRequest
2020
import org.springframework.context.annotation.Bean
2121
import org.springframework.context.annotation.Configuration
2222
import org.springframework.security.config.annotation.web.builders.HttpSecurity

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/actuator/endpoints/security/typical/MySecurityConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.docs.actuator.endpoints.security.typical
1818

19-
import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest
19+
import org.springframework.boot.security.actuate.autoconfigure.servlet.EndpointRequest
2020
import org.springframework.context.annotation.Bean
2121
import org.springframework.context.annotation.Configuration
2222
import org.springframework.security.config.Customizer.withDefaults

0 commit comments

Comments
 (0)