diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle index c8866ad1cfb..4ed7b0ded33 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle @@ -18,7 +18,6 @@ plugins { id "java-library" id "org.springframework.boot.auto-configuration" - id "org.springframework.boot.configuration-properties" id "org.springframework.boot.deployed" id "org.springframework.boot.optional-dependencies" } @@ -37,113 +36,30 @@ dependencies { api(project(":spring-boot-project:spring-boot-actuator-autoconfigure")) api(project(":spring-boot-project:spring-boot-autoconfigure")) - implementation("com.fasterxml.jackson.core:jackson-databind") - implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310") - - optional(project(":spring-boot-project:spring-boot-activemq")) - optional(project(":spring-boot-project:spring-boot-artemis")) - optional(project(":spring-boot-project:spring-boot-couchbase")) - optional(project(":spring-boot-project:spring-boot-data-cassandra")) - optional(project(":spring-boot-project:spring-boot-data-jpa")) - optional(project(":spring-boot-project:spring-boot-http-converter")) - optional(project(":spring-boot-project:spring-boot-http-codec")) - optional(project(":spring-boot-project:spring-boot-jackson")) optional(project(":spring-boot-project:spring-boot-jersey")) - optional(project(":spring-boot-project:spring-boot-jsonb")) - optional(project(":spring-boot-project:spring-boot-kafka")) - optional(project(":spring-boot-project:spring-boot-metrics")) - optional(project(":spring-boot-project:spring-boot-opentelemetry")) - optional(project(":spring-boot-project:spring-boot-restclient")) optional(project(":spring-boot-project:spring-boot-security")) optional(project(":spring-boot-project:spring-boot-security-oauth2-client")) optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server")) optional(project(":spring-boot-project:spring-boot-security-saml2")) - optional(project(":spring-boot-project:spring-boot-tomcat")) - optional(project(":spring-boot-project:spring-boot-validation")) - optional(project(":spring-boot-project:spring-boot-webclient")) - optional(project(":spring-boot-project:spring-boot-webflux")) + optional(project(":spring-boot-project:spring-boot-web-server")) optional(project(":spring-boot-project:spring-boot-webmvc")) - optional(project(":spring-boot-project:spring-boot-zipkin")) - optional("ch.qos.logback:logback-classic") - optional("org.apache.cassandra:java-driver-core") { - exclude group: "org.slf4j", module: "jcl-over-slf4j" - } - optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml") - optional("com.github.ben-manes.caffeine:caffeine") - optional("com.hazelcast:hazelcast-spring") - optional("com.zaxxer:HikariCP") - optional("io.lettuce:lettuce-core") - optional("io.micrometer:micrometer-jakarta9") - optional("io.micrometer:micrometer-observation") - optional("io.projectreactor.netty:reactor-netty-http") - optional("jakarta.persistence:jakarta.persistence-api") + optional("io.projectreactor:reactor-core") optional("jakarta.servlet:jakarta.servlet-api") - optional("org.apache.activemq:activemq-broker") - optional("org.apache.activemq:activemq-client") - optional("org.apache.commons:commons-dbcp2") - optional("org.apache.kafka:kafka-clients") - optional("org.apache.kafka:kafka-streams") - optional("org.apache.logging.log4j:log4j-api") - optional("org.apache.tomcat.embed:tomcat-embed-core") - optional("org.apache.tomcat.embed:tomcat-embed-el") - optional("org.apache.tomcat:tomcat-jdbc") - optional("org.aspectj:aspectjweaver") - optional("org.eclipse.jetty:jetty-server") { - exclude group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api" - } - optional("org.glassfish.jersey.core:jersey-server") - optional("org.glassfish.jersey.containers:jersey-container-servlet-core") - optional("org.hibernate.orm:hibernate-core") - optional("org.hibernate.orm:hibernate-micrometer") - optional("org.hibernate.validator:hibernate-validator") - optional("org.influxdb:influxdb-java") - optional("org.junit.platform:junit-platform-launcher") - optional("org.springframework:spring-messaging") - optional("org.springframework:spring-webflux") - optional("org.springframework:spring-webmvc") - optional("org.springframework.kafka:spring-kafka") - optional("org.springframework.security:spring-security-config") - optional("org.springframework.security:spring-security-web") + testImplementation(project(":spring-boot-project:spring-boot-data-cassandra")) testImplementation(project(":spring-boot-project:spring-boot-data-rest")) testImplementation(project(":spring-boot-project:spring-boot-hateoas")) + testImplementation(project(":spring-boot-project:spring-boot-http-codec")) + testImplementation(project(":spring-boot-project:spring-boot-http-converter")) + testImplementation(project(":spring-boot-project:spring-boot-jackson")) testImplementation(project(":spring-boot-project:spring-boot-reactor-netty")) - testImplementation(project(":spring-boot-project:spring-boot-restclient-test")) testImplementation(project(":spring-boot-project:spring-boot-test")) + testImplementation(project(":spring-boot-project:spring-boot-tomcat")) testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) - testImplementation(project(":spring-boot-project:spring-boot-web-server-test")) - testImplementation(testFixtures(project(":spring-boot-project:spring-boot-metrics"))) - testImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server"))) - testImplementation("com.squareup.okhttp3:mockwebserver") - testImplementation("io.micrometer:micrometer-observation-test") - testImplementation("io.projectreactor:reactor-test") - testImplementation("jakarta.xml.bind:jakarta.xml.bind-api") - testImplementation("org.apache.activemq:artemis-jakarta-client") - testImplementation("org.apache.activemq:artemis-jakarta-server") - testImplementation("org.apache.logging.log4j:log4j-to-slf4j") - testImplementation("org.aspectj:aspectjrt") - testImplementation("org.eclipse.jetty.ee10:jetty-ee10-webapp") - testImplementation("org.eclipse.jetty.http2:jetty-http2-server") - testImplementation("org.glassfish.jersey.ext:jersey-spring6") - testImplementation("org.glassfish.jersey.media:jersey-media-json-jackson") - testImplementation("org.hsqldb:hsqldb") - testImplementation("org.springframework:spring-orm") + testImplementation(project(":spring-boot-project:spring-boot-webflux")) testImplementation("org.springframework.security:spring-security-test") - testImplementation("org.yaml:snakeyaml") - - testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api") - testRuntimeOnly("jakarta.transaction:jakarta.transaction-api") - testRuntimeOnly("org.opensaml:opensaml-core:4.0.1") - testRuntimeOnly("org.opensaml:opensaml-saml-api:4.0.1") - testRuntimeOnly("org.opensaml:opensaml-saml-impl:4.0.1") - testRuntimeOnly("org.springframework:spring-aspects") - testRuntimeOnly("org.springframework.security:spring-security-oauth2-jose") - testRuntimeOnly("org.springframework.security:spring-security-oauth2-resource-server") - testRuntimeOnly("org.springframework.security:spring-security-saml2-service-provider") { - exclude group: "org.opensaml", module: "opensaml-core" - exclude group: "org.opensaml", module: "opensaml-saml-api" - exclude group: "org.opensaml", module: "opensaml-saml-impl" - } + + testRuntimeOnly("ch.qos.logback:logback-classic") } tasks.named("test") { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json deleted file mode 100644 index 5a0429378ad..00000000000 --- a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "groups": [], - "properties": [ - { - "name": "management.health.ssl.enabled", - "type": "java.lang.Boolean", - "description": "Whether to enable SSL certificate health check.", - "defaultValue": true - }, - { - "name": "management.promethus.metrics.export.pushgateway.base-url", - "type": "java.lang.String", - "deprecation": { - "level": "error", - "replacement": "management.prometheus.metrics.export.pushgateway.address" - } - } - ] -} diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 06eac54ccfe..de489eb9d2d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -138,6 +138,12 @@ "description": "Whether to enable readiness state health check.", "defaultValue": false }, + { + "name": "management.health.ssl.enabled", + "type": "java.lang.Boolean", + "description": "Whether to enable SSL certificate health check.", + "defaultValue": true + }, { "name": "management.httpexchanges.recording.enabled", "type": "java.lang.Boolean", diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java similarity index 100% rename from spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementContextConfigurationImportSelectorTests.java diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerPropertiesTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerPropertiesTests.java similarity index 100% rename from spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerPropertiesTests.java rename to spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerPropertiesTests.java diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 3c10af6c28a..c033cb96400 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -165,7 +165,6 @@ dependencies { configurationProperties(project(path: ":spring-boot-project:spring-boot-activemq", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure", configuration: "configurationPropertiesMetadata")) - configurationProperties(project(path: ":spring-boot-project:spring-boot-actuator-autoconfigure-all", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":spring-boot-project:spring-boot-amqp", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":spring-boot-project:spring-boot-artemis", configuration: "configurationPropertiesMetadata")) configurationProperties(project(path: ":spring-boot-project:spring-boot-autoconfigure", configuration: "configurationPropertiesMetadata")) diff --git a/spring-boot-project/spring-boot-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 86acfb62330..92b38e4e788 100644 --- a/spring-boot-project/spring-boot-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-metrics/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -1621,6 +1621,14 @@ "replacement": "management.observations.http.server.requests.name", "level": "error" } + }, + { + "name": "management.promethus.metrics.export.pushgateway.base-url", + "type": "java.lang.String", + "deprecation": { + "level": "error", + "replacement": "management.prometheus.metrics.export.pushgateway.address" + } } ] }