Start splitting up spring-boot-actuator

Author: wilkinsona

settings.gradle

@@ -60,6 +60,7 @@ include "spring-boot-project:spring-boot"
 include "spring-boot-project:spring-boot-autoconfigure"
 include "spring-boot-project:spring-boot-autoconfigure-all"
 include "spring-boot-project:spring-boot-actuator"
+include "spring-boot-project:spring-boot-actuator-all"
 include "spring-boot-project:spring-boot-actuator-autoconfigure"
 include "spring-boot-project:spring-boot-all"
 include "spring-boot-project:spring-boot-docker-compose"

spring-boot-project/spring-boot-actuator/README.adoc renamed to spring-boot-project/spring-boot-actuator-all/README.adoc

@@ -0,0 +1,122 @@
+plugins {
+	id "java-library"
+	id "org.springframework.boot.optional-dependencies"
+	id "org.springframework.boot.docker-test"
+	id "org.springframework.boot.deployed"
+}
+
+description = "Spring Boot Actuator All"
+
+dependencies {
+	api(project(":spring-boot-project:spring-boot-all"))
+	api(project(":spring-boot-project:spring-boot-actuator"))
+
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
+	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
+	dockerTestImplementation("com.redis:testcontainers-redis")
+	dockerTestImplementation("org.assertj:assertj-core")
+	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
+	dockerTestImplementation("org.springframework:spring-test")
+	dockerTestImplementation("org.testcontainers:junit-jupiter")
+	dockerTestImplementation("org.testcontainers:mongodb")
+	dockerTestImplementation("org.testcontainers:neo4j")
+	dockerTestImplementation("org.testcontainers:testcontainers")
+
+	optional(project(":spring-boot-project:spring-boot-tomcat"))
+	optional("org.apache.cassandra:java-driver-core") {
+		exclude group: "org.slf4j", module: "jcl-over-slf4j"
+	}
+	optional("com.fasterxml.jackson.core:jackson-databind")
+	optional("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	optional("com.github.ben-manes.caffeine:caffeine")
+	optional("com.hazelcast:hazelcast")
+	optional("com.hazelcast:hazelcast-spring")
+	optional("com.zaxxer:HikariCP")
+	optional("io.lettuce:lettuce-core")
+	optional("io.micrometer:micrometer-observation")
+	optional("io.micrometer:micrometer-jakarta9")
+	optional("io.micrometer:micrometer-tracing")
+	optional("io.micrometer:micrometer-registry-prometheus")
+	optional("io.micrometer:micrometer-registry-prometheus-simpleclient")
+	optional("io.prometheus:prometheus-metrics-exposition-formats")
+	optional("io.prometheus:prometheus-metrics-exporter-pushgateway")
+	optional("io.r2dbc:r2dbc-pool")
+	optional("io.r2dbc:r2dbc-spi")
+	optional("io.undertow:undertow-servlet")
+	optional("javax.cache:cache-api")
+	optional("jakarta.jms:jakarta.jms-api")
+	optional("org.apache.tomcat.embed:tomcat-embed-core")
+	optional("org.aspectj:aspectjweaver")
+	optional("org.cache2k:cache2k-micrometer")
+	optional("org.cache2k:cache2k-spring")
+	optional("org.eclipse.angus:angus-mail")
+	optional("org.eclipse.jetty:jetty-server") {
+		exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
+	}
+	optional("org.elasticsearch.client:elasticsearch-rest-client") {
+		exclude(group: "commons-logging", module: "commons-logging")
+	}
+	optional("org.flywaydb:flyway-core")
+	optional("org.glassfish.jersey.core:jersey-server")
+	optional("org.glassfish.jersey.containers:jersey-container-servlet-core")
+	optional("org.hibernate.validator:hibernate-validator")
+	optional("org.influxdb:influxdb-java")
+	optional("org.liquibase:liquibase-core") {
+		exclude(group: "javax.xml.bind", module: "jaxb-api")
+	}
+	optional("org.mongodb:mongodb-driver-reactivestreams")
+	optional("org.mongodb:mongodb-driver-sync")
+	optional("org.neo4j.driver:neo4j-java-driver")
+	optional("org.quartz-scheduler:quartz")
+	optional("org.springframework:spring-jdbc")
+	optional("org.springframework:spring-messaging")
+	optional("org.springframework:spring-webflux")
+	optional("org.springframework:spring-web")
+	optional("org.springframework:spring-webmvc")
+	optional("org.springframework.graphql:spring-graphql")
+	optional("org.springframework.amqp:spring-rabbit")
+	optional("org.springframework.data:spring-data-cassandra") {
+		exclude group: "org.slf4j", module: "jcl-over-slf4j"
+	}
+	optional("org.springframework.data:spring-data-couchbase")
+	optional("org.springframework.data:spring-data-elasticsearch")  {
+		exclude(group: "commons-logging", module: "commons-logging")
+	}
+	optional("org.springframework.data:spring-data-ldap")
+	optional("org.springframework.data:spring-data-mongodb")
+	optional("org.springframework.data:spring-data-redis")
+	optional("org.springframework.data:spring-data-rest-webmvc")
+	optional("org.springframework.integration:spring-integration-core")
+	optional("org.springframework.security:spring-security-core")
+	optional("org.springframework.security:spring-security-web")
+	optional("org.springframework.session:spring-session-core")
+
+	testImplementation(project(":spring-boot-project:spring-boot-test"))
+	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
+	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-actuator")))
+	testImplementation("org.assertj:assertj-core")
+	testImplementation("com.jayway.jsonpath:json-path")
+	testImplementation("io.micrometer:micrometer-observation-test")
+	testImplementation("io.projectreactor:reactor-test")
+	testImplementation("io.r2dbc:r2dbc-h2")
+	testImplementation("net.minidev:json-smart")
+	testImplementation("org.apache.logging.log4j:log4j-to-slf4j")
+	testImplementation("org.awaitility:awaitility")
+	testImplementation("org.glassfish.jersey.media:jersey-media-json-jackson")
+	testImplementation("org.hamcrest:hamcrest")
+	testImplementation("org.junit.jupiter:junit-jupiter")
+	testImplementation("org.mockito:mockito-core")
+	testImplementation("org.mockito:mockito-junit-jupiter")
+	testImplementation("org.skyscreamer:jsonassert")
+	testImplementation("org.springframework:spring-test")
+	testImplementation("com.squareup.okhttp3:mockwebserver")
+
+	testRuntimeOnly("ch.qos.logback:logback-classic")
+	testRuntimeOnly("io.projectreactor.netty:reactor-netty-http")
+	testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
+	testRuntimeOnly("org.apache.tomcat.embed:tomcat-embed-el")
+	testRuntimeOnly("org.glassfish.jersey.ext:jersey-spring6")
+	testRuntimeOnly("org.hsqldb:hsqldb")
+}

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

@@ -10,7 +10,7 @@ plugins {
 description = "Spring Boot Actuator AutoConfigure"
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-actuator"))
+	api(project(":spring-boot-project:spring-boot-actuator-all"))
 	api(project(":spring-boot-project:spring-boot-all"))
 	api(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 

spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetricsTests.java renamed to spring-boot-project/spring-boot-actuator-all/src/dockerTest/java/org/springframework/boot/actuate/metrics/cache/RedisCacheMetricsTests.java

@@ -1,121 +1,57 @@
 plugins {
 	id "java-library"
+	id "java-test-fixtures"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.optional-dependencies"
-	id "org.springframework.boot.docker-test"
 	id "org.springframework.boot.deployed"
 }
 
 description = "Spring Boot Actuator"
 
 dependencies {
-	api(project(":spring-boot-project:spring-boot-all"))
-
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
-	dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
-	dockerTestImplementation("com.redis:testcontainers-redis")
-	dockerTestImplementation("org.assertj:assertj-core")
-	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
-	dockerTestImplementation("org.springframework:spring-test")
-	dockerTestImplementation("org.testcontainers:junit-jupiter")
-	dockerTestImplementation("org.testcontainers:mongodb")
-	dockerTestImplementation("org.testcontainers:neo4j")
-	dockerTestImplementation("org.testcontainers:testcontainers")
-
-	optional(project(":spring-boot-project:spring-boot-tomcat"))
-	optional("org.apache.cassandra:java-driver-core") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
+	api(project(":spring-boot-project:spring-boot"))
+	
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	optional("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
-	optional("com.github.ben-manes.caffeine:caffeine")
-	optional("com.hazelcast:hazelcast")
-	optional("com.hazelcast:hazelcast-spring")
-	optional("com.zaxxer:HikariCP")
-	optional("io.lettuce:lettuce-core")
-	optional("io.micrometer:micrometer-observation")
-	optional("io.micrometer:micrometer-jakarta9")
-	optional("io.micrometer:micrometer-tracing")
-	optional("io.micrometer:micrometer-registry-prometheus")
-	optional("io.micrometer:micrometer-registry-prometheus-simpleclient")
-	optional("io.prometheus:prometheus-metrics-exposition-formats")
-	optional("io.prometheus:prometheus-metrics-exporter-pushgateway")
-	optional("io.r2dbc:r2dbc-pool")
-	optional("io.r2dbc:r2dbc-spi")
-	optional("io.undertow:undertow-servlet")
-	optional("javax.cache:cache-api")
-	optional("jakarta.jms:jakarta.jms-api")
-	optional("org.apache.tomcat.embed:tomcat-embed-core")
-	optional("org.aspectj:aspectjweaver")
-	optional("org.cache2k:cache2k-micrometer")
-	optional("org.cache2k:cache2k-spring")
-	optional("org.eclipse.angus:angus-mail")
-	optional("org.eclipse.jetty:jetty-server") {
-		exclude(group: "org.eclipse.jetty.toolchain", module: "jetty-jakarta-servlet-api")
-	}
-	optional("org.elasticsearch.client:elasticsearch-rest-client") {
-		exclude(group: "commons-logging", module: "commons-logging")
-	}
-	optional("org.flywaydb:flyway-core")
+	optional("com.google.code.findbugs:jsr305")
+	optional("io.projectreactor:reactor-core")
+	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("org.glassfish.jersey.core:jersey-server")
 	optional("org.glassfish.jersey.containers:jersey-container-servlet-core")
-	optional("org.hibernate.validator:hibernate-validator")
-	optional("org.influxdb:influxdb-java")
-	optional("org.liquibase:liquibase-core") {
-		exclude(group: "javax.xml.bind", module: "jaxb-api")
-	}
-	optional("org.mongodb:mongodb-driver-reactivestreams")
-	optional("org.mongodb:mongodb-driver-sync")
-	optional("org.neo4j.driver:neo4j-java-driver")
-	optional("org.quartz-scheduler:quartz")
-	optional("org.springframework:spring-jdbc")
-	optional("org.springframework:spring-messaging")
-	optional("org.springframework:spring-webflux")
 	optional("org.springframework:spring-web")
+	optional("org.springframework:spring-webflux")
 	optional("org.springframework:spring-webmvc")
-	optional("org.springframework.graphql:spring-graphql")
-	optional("org.springframework.amqp:spring-rabbit")
-	optional("org.springframework.data:spring-data-cassandra") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
-	optional("org.springframework.data:spring-data-couchbase")
-	optional("org.springframework.data:spring-data-elasticsearch")  {
-		exclude(group: "commons-logging", module: "commons-logging")
-	}
-	optional("org.springframework.data:spring-data-ldap")
-	optional("org.springframework.data:spring-data-mongodb")
-	optional("org.springframework.data:spring-data-redis")
-	optional("org.springframework.data:spring-data-rest-webmvc")
-	optional("org.springframework.integration:spring-integration-core")
 	optional("org.springframework.security:spring-security-core")
-	optional("org.springframework.security:spring-security-web")
-	optional("org.springframework.session:spring-session-core")
 
+	testFixturesCompileOnly(project(":spring-boot-project:spring-boot-autoconfigure-all"))
+	testFixturesCompileOnly(project(":spring-boot-project:spring-boot-tomcat"))
+	testFixturesCompileOnly("org.springframework:spring-test")
+	testFixturesImplementation("org.junit.jupiter:junit-jupiter")
+
+	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure-all"))
 	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-autoconfigure-all"))
-	testImplementation("org.assertj:assertj-core")
-	testImplementation("com.jayway.jsonpath:json-path")
-	testImplementation("io.micrometer:micrometer-observation-test")
+	testImplementation("com.zaxxer:HikariCP")
 	testImplementation("io.projectreactor:reactor-test")
-	testImplementation("io.r2dbc:r2dbc-h2")
 	testImplementation("net.minidev:json-smart")
-	testImplementation("org.apache.logging.log4j:log4j-to-slf4j")
+	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.awaitility:awaitility")
 	testImplementation("org.glassfish.jersey.media:jersey-media-json-jackson")
-	testImplementation("org.hamcrest:hamcrest")
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testImplementation("org.mockito:mockito-core")
 	testImplementation("org.mockito:mockito-junit-jupiter")
 	testImplementation("org.skyscreamer:jsonassert")
+	testImplementation("org.springframework:spring-jdbc")
 	testImplementation("org.springframework:spring-test")
-	testImplementation("com.squareup.okhttp3:mockwebserver")
+	testImplementation("org.springframework:spring-tx")
+	testImplementation("org.springframework.security:spring-security-web")
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")
+	testRuntimeOnly("com.jayway.jsonpath:json-path")
 	testRuntimeOnly("io.projectreactor.netty:reactor-netty-http")
-	testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api")
 	testRuntimeOnly("org.apache.tomcat.embed:tomcat-embed-el")
 	testRuntimeOnly("org.glassfish.jersey.ext:jersey-spring6")
+	testRuntimeOnly("org.hibernate.validator:hibernate-validator")
 	testRuntimeOnly("org.hsqldb:hsqldb")
 }

spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoHealthIndicatorIntegrationTests.java renamed to spring-boot-project/spring-boot-actuator-all/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoHealthIndicatorIntegrationTests.java

@@ -100,6 +100,13 @@ bom {
 			]
 		}
 	}
+	library("JSR 305", "3.0.2") {
+		group("com.google.code.findbugs") {
+			modules = [
+				"jsr305"
+			]
+		}
+	}
 	library("Maven", "${mavenVersion}") {
 		group("org.apache.maven") {
 			modules = [

spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorIntegrationTests.java renamed to spring-boot-project/spring-boot-actuator-all/src/dockerTest/java/org/springframework/boot/actuate/mongo/MongoReactiveHealthIndicatorIntegrationTests.java

@@ -82,7 +82,7 @@ dependencies {
 	optional("org.mongodb:mongodb-driver-sync")
 	optional("io.micrometer:micrometer-tracing")
 
-	testImplementation(project(":spring-boot-project:spring-boot-actuator"))
+	testImplementation(project(":spring-boot-project:spring-boot-actuator-all"))
 	testImplementation(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	testImplementation(project(":spring-boot-project:spring-boot-testcontainers"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

spring-boot-project/spring-boot-actuator/src/dockerTest/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java renamed to spring-boot-project/spring-boot-actuator-all/src/dockerTest/java/org/springframework/boot/actuate/neo4j/Neo4jReactiveHealthIndicatorIntegrationTests.java

@@ -15,7 +15,7 @@ sourceSets {
 }
 
 dependencies {
-	testCompileOnly("com.google.code.findbugs:jsr305:3.0.2")
+	testCompileOnly("com.google.code.findbugs:jsr305")
 	testImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-dependencies")))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
 	testImplementation("org.springframework:spring-core-test")