Skip to content

Commit b49c183

Browse files
wilkinsonawilkinsona
committed
Fix problems found by improved auto-configuration checks
1 parent e301bbe commit b49c183

File tree

62 files changed

+158
-149
lines changed

Some content is hidden

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

62 files changed

+158
-149
lines changed

‎spring-boot-project/spring-boot-activemq/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
1717
optional(project(":spring-boot-project:spring-boot-docker-compose"))
1818
optional(project(":spring-boot-project:spring-boot-testcontainers"))
19+
optional(project(":spring-boot-project:spring-boot-tx"))
1920
optional("jakarta.transaction:jakarta.transaction-api")
2021
optional("org.apache.activemq:activemq-broker")
2122
optional("org.messaginghub:pooled-jms") {

‎spring-boot-project/spring-boot-activemq/src/main/java/org/springframework/boot/activemq/autoconfigure/ActiveMQAutoConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration;
2828
import org.springframework.boot.jms.autoconfigure.JmsProperties;
2929
import org.springframework.boot.jms.autoconfigure.JndiConnectionFactoryAutoConfiguration;
30+
import org.springframework.boot.transaction.jta.autoconfigure.JtaAutoConfiguration;
3031
import org.springframework.context.annotation.Bean;
3132
import org.springframework.context.annotation.Import;
3233

@@ -39,8 +40,8 @@
3940
* @author Eddú Meléndez
4041
* @since 3.1.0
4142
*/
42-
@AutoConfiguration(before = JmsAutoConfiguration.class, after = JndiConnectionFactoryAutoConfiguration.class,
43-
afterName = "org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration")
43+
@AutoConfiguration(before = JmsAutoConfiguration.class,
44+
after = { JndiConnectionFactoryAutoConfiguration.class, JtaAutoConfiguration.class })
4445
@ConditionalOnClass({ ConnectionFactory.class, ActiveMQConnectionFactory.class })
4546
@ConditionalOnMissingBean(ConnectionFactory.class)
4647
@EnableConfigurationProperties({ ActiveMQProperties.class, JmsProperties.class })

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ dependencies {
2020
api(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
2121
api(project(":spring-boot-project:spring-boot-autoconfigure"))
2222

23-
implementation(project(":spring-boot-project:spring-boot-metrics"))
24-
implementation(project(":spring-boot-project:spring-boot-security")) {
25-
exclude(group: "org.springframework.security")
26-
}
2723
implementation("com.fasterxml.jackson.core:jackson-databind")
2824
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
2925

@@ -41,6 +37,7 @@ dependencies {
4137
optional(project(":spring-boot-project:spring-boot-metrics"))
4238
optional(project(":spring-boot-project:spring-boot-opentelemetry"))
4339
optional(project(":spring-boot-project:spring-boot-restclient"))
40+
optional(project(":spring-boot-project:spring-boot-security"))
4441
optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))
4542
optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
4643
optional(project(":spring-boot-project:spring-boot-security-saml2"))

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/observability/ObservabilityAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
@AutoConfiguration(beforeName = "org.springframework.boot.observation.autoconfigure.ObservationAutoConfiguration",
5454
afterName = "org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration",
5555
after = MicrometerTracingAutoConfiguration.class)
56-
@ConditionalOnClass(ObservationRegistry.class)
56+
@ConditionalOnClass({ ObservationRegistry.class, ObservationHandlerGrouping.class })
5757
public class ObservabilityAutoConfiguration {
5858

5959
@Configuration(proxyBeanMethods = false)

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/security/reactive/ReactiveManagementWebSecurityAutoConfiguration.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
31-
import org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration;
32-
import org.springframework.boot.security.autoconfigure.reactive.ReactiveUserDetailsServiceAutoConfiguration;
3331
import org.springframework.context.annotation.Bean;
3432
import org.springframework.security.authentication.ReactiveAuthenticationManager;
3533
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
@@ -53,12 +51,14 @@
5351
* @author Madhura Bhave
5452
* @since 2.1.0
5553
*/
56-
@AutoConfiguration(before = ReactiveSecurityAutoConfiguration.class,
54+
@AutoConfiguration(
55+
beforeName = "org.springframework.boot.security.autoconfigure.reactive.ReactiveSecurityAutoConfiguration",
5756
after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class,
58-
WebEndpointAutoConfiguration.class, ReactiveUserDetailsServiceAutoConfiguration.class },
57+
WebEndpointAutoConfiguration.class },
5958
afterName = {
6059
"org.springframework.boot.security.oauth2.client.autoconfigure.reactive.ReactiveOAuth2ClientWebSecurityAutoConfiguration",
61-
"org.springframework.boot.security.oauth2.server.resource.autoconfigure.reactive.ReactiveOAuth2ResourceServerAutoConfiguration" })
60+
"org.springframework.boot.security.oauth2.server.resource.autoconfigure.reactive.ReactiveOAuth2ResourceServerAutoConfiguration",
61+
"org.springframework.boot.security.autoconfigure.reactive.ReactiveUserDetailsServiceAutoConfiguration" })
6262
@ConditionalOnClass({ EnableWebFluxSecurity.class, WebFilterChainProxy.class })
6363
@ConditionalOnMissingBean({ SecurityWebFilterChain.class, WebFilterChainProxy.class })
6464
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/security/servlet/ManagementWebSecurityAutoConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import org.springframework.boot.actuate.health.HealthEndpoint;
2323
import org.springframework.boot.autoconfigure.AutoConfiguration;
2424
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
25+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2526
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2627
import org.springframework.boot.security.autoconfigure.ConditionalOnDefaultWebSecurity;
2728
import org.springframework.boot.security.autoconfigure.SecurityProperties;
28-
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.core.annotation.Order;
3131
import org.springframework.core.env.Environment;
@@ -47,13 +47,14 @@
4747
* @author Hatef Palizgar
4848
* @since 2.1.0
4949
*/
50-
@AutoConfiguration(before = SecurityAutoConfiguration.class,
50+
@AutoConfiguration(beforeName = "org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration",
5151
after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class },
5252
afterName = {
5353
"org.springframework.boot.security.oauth2.client.autoconfigure.servlet.OAuth2ClientWebSecurityAutoConfiguration",
5454
"org.springframework.boot.security.oauth2.server.resource.autoconfigure.servlet.OAuth2ResourceServerAutoConfiguration",
5555
"org.springframework.boot.security.saml2.autoconfigure.Saml2RelyingPartyAutoConfiguration" })
5656
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
57+
@ConditionalOnClass(RequestMatcher.class)
5758
@ConditionalOnDefaultWebSecurity
5859
public class ManagementWebSecurityAutoConfiguration {
5960

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/ssl/SslObservabilityAutoConfiguration.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration;
2727
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2828
import org.springframework.boot.info.SslInfo;
29-
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
30-
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
3129
import org.springframework.boot.ssl.SslBundles;
3230
import org.springframework.context.annotation.Bean;
3331

@@ -37,8 +35,9 @@
3735
* @author Moritz Halbritter
3836
* @since 3.5.0
3937
*/
40-
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class,
41-
SslAutoConfiguration.class })
38+
@AutoConfiguration(after = SslAutoConfiguration.class,
39+
afterName = { "org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration",
40+
"org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration" })
4241
@ConditionalOnClass(MeterRegistry.class)
4342
@ConditionalOnBean({ MeterRegistry.class, SslBundles.class })
4443
@EnableConfigurationProperties(SslHealthIndicatorProperties.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/prometheus/PrometheusExemplarsAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
30-
import org.springframework.boot.metrics.autoconfigure.export.prometheus.PrometheusMetricsExportAutoConfiguration;
3130
import org.springframework.context.annotation.Bean;
3231
import org.springframework.util.function.SingletonSupplier;
3332

@@ -38,7 +37,8 @@
3837
* @author Jonatan Ivanov
3938
* @since 3.0.0
4039
*/
41-
@AutoConfiguration(before = PrometheusMetricsExportAutoConfiguration.class,
40+
@AutoConfiguration(
41+
beforeName = "org.springframework.boot.metrics.autoconfigure.export.prometheus.PrometheusMetricsExportAutoConfiguration",
4242
after = MicrometerTracingAutoConfiguration.class)
4343
@ConditionalOnBean(Tracer.class)
4444
@ConditionalOnClass({ Tracer.class, SpanContext.class })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ org.springframework.boot.actuate.autoconfigure.beans.BeansEndpointAutoConfigurat
66
org.springframework.boot.actuate.autoconfigure.cloudfoundry.reactive.ReactiveCloudFoundryActuatorAutoConfiguration
77
org.springframework.boot.actuate.autoconfigure.cloudfoundry.servlet.CloudFoundryActuatorAutoConfiguration
88
org.springframework.boot.actuate.autoconfigure.condition.ConditionsReportEndpointAutoConfiguration
9-
org.springframework.boot.actuate.autoconfigure.context.properties.ConfigurationPropertiesReportEndpointAutoConfiguration
109
org.springframework.boot.actuate.autoconfigure.context.ShutdownEndpointAutoConfiguration
10+
org.springframework.boot.actuate.autoconfigure.context.properties.ConfigurationPropertiesReportEndpointAutoConfiguration
1111
org.springframework.boot.actuate.autoconfigure.endpoint.jackson.JacksonEndpointAutoConfiguration
1212
org.springframework.boot.actuate.autoconfigure.endpoint.jmx.JmxEndpointAutoConfiguration
1313
org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration

‎spring-boot-project/spring-boot-artemis/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
1717
optional(project(":spring-boot-project:spring-boot-docker-compose"))
1818
optional(project(":spring-boot-project:spring-boot-testcontainers"))
19+
optional(project(":spring-boot-project:spring-boot-tx"))
1920
optional("org.apache.activemq:artemis-jakarta-server")
2021
optional("org.messaginghub:pooled-jms") {
2122
exclude group: "org.apache.geronimo.specs", module: "geronimo-jms_2.0_spec"

‎spring-boot-project/spring-boot-artemis/src/main/java/org/springframework/boot/artemis/autoconfigure/ArtemisAutoConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.springframework.boot.jms.autoconfigure.JmsAutoConfiguration;
2828
import org.springframework.boot.jms.autoconfigure.JmsProperties;
2929
import org.springframework.boot.jms.autoconfigure.JndiConnectionFactoryAutoConfiguration;
30+
import org.springframework.boot.transaction.jta.autoconfigure.JtaAutoConfiguration;
3031
import org.springframework.context.annotation.Bean;
3132
import org.springframework.context.annotation.Import;
3233

@@ -41,8 +42,8 @@
4142
* @since 1.3.0
4243
* @see ArtemisProperties
4344
*/
44-
@AutoConfiguration(before = JmsAutoConfiguration.class, after = JndiConnectionFactoryAutoConfiguration.class,
45-
afterName = "org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration")
45+
@AutoConfiguration(before = JmsAutoConfiguration.class,
46+
after = { JndiConnectionFactoryAutoConfiguration.class, JtaAutoConfiguration.class })
4647
@ConditionalOnClass({ ConnectionFactory.class, ActiveMQConnectionFactory.class })
4748
@ConditionalOnMissingBean(ConnectionFactory.class)
4849
@EnableConfigurationProperties({ ArtemisProperties.class, JmsProperties.class })

‎spring-boot-project/spring-boot-batch/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ dependencies {
1616
implementation(project(":spring-boot-project:spring-boot-tx"))
1717

1818
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
19+
optional(project(":spring-boot-project:spring-boot-jpa"))
1920
optional(project(":spring-boot-project:spring-boot-observation"))
2021

2122
testImplementation(project(":spring-boot-project:spring-boot-flyway"))
22-
testImplementation(project(":spring-boot-project:spring-boot-jpa"))
2323
testImplementation(project(":spring-boot-project:spring-boot-liquibase"))
2424
testImplementation(project(":spring-boot-project:spring-boot-test"))
2525
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration
21
org.springframework.boot.cassandra.actuate.health.autoconfigure.CassandraHealthContributorAutoConfiguration
3-
org.springframework.boot.cassandra.actuate.health.autoconfigure.CassandraReactiveHealthContributorAutoConfiguration
2+
org.springframework.boot.cassandra.actuate.health.autoconfigure.CassandraReactiveHealthContributorAutoConfiguration
3+
org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration

‎spring-boot-project/spring-boot-data-cassandra/src/main/java/org/springframework/boot/data/cassandra/autoconfigure/CassandraDataAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3030
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3131
import org.springframework.boot.autoconfigure.domain.EntityScanPackages;
32+
import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
3233
import org.springframework.boot.context.properties.bind.Binder;
3334
import org.springframework.context.annotation.Bean;
3435
import org.springframework.context.annotation.Lazy;
@@ -59,7 +60,7 @@
5960
* @author Christoph Strobl
6061
* @since 4.0.0
6162
*/
62-
@AutoConfiguration(afterName = "org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration")
63+
@AutoConfiguration(after = CassandraAutoConfiguration.class)
6364
@ConditionalOnClass({ CqlSession.class, CassandraAdminOperations.class })
6465
@ConditionalOnBean(CqlSession.class)
6566
public class CassandraDataAutoConfiguration {

‎spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/metrics/autoconfigure/RepositoryMetricsAutoConfiguration.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
import org.springframework.boot.data.metrics.MetricsRepositoryMethodInvocationListener;
3030
import org.springframework.boot.data.metrics.RepositoryTagsProvider;
3131
import org.springframework.boot.data.metrics.autoconfigure.DataMetricsProperties.Repository;
32-
import org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration;
33-
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
34-
import org.springframework.boot.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration;
3532
import org.springframework.context.annotation.Bean;
3633
import org.springframework.util.function.SingletonSupplier;
3734

@@ -41,8 +38,9 @@
4138
* @author Phillip Webb
4239
* @since 4.0.0
4340
*/
44-
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class,
45-
SimpleMetricsExportAutoConfiguration.class })
41+
@AutoConfiguration(afterName = { "org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration",
42+
"org.springframework.boot.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration",
43+
"org.springframework.boot.metrics.autoconfigure.export.simple.SimpleMetricsExportAutoConfiguration" })
4644
@ConditionalOnClass(org.springframework.data.repository.Repository.class)
4745
@ConditionalOnBean(MeterRegistry.class)
4846
@EnableConfigurationProperties(DataMetricsProperties.class)

‎spring-boot-project/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
2626
import org.springframework.boot.context.properties.EnableConfigurationProperties;
27+
import org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration;
2728
import org.springframework.context.annotation.Bean;
2829
import org.springframework.context.annotation.Configuration;
2930
import org.springframework.context.annotation.Import;
@@ -37,8 +38,8 @@
3738
* @author Stephane Nicoll
3839
* @since 4.0.0
3940
*/
40-
@AutoConfiguration(afterName = { "org.springframework.boot.couchbase.autoconfigure.CouchbaseAutoConfiguration",
41-
"org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration" })
41+
@AutoConfiguration(after = CouchbaseAutoConfiguration.class,
42+
afterName = "org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration")
4243
@ConditionalOnClass({ Bucket.class, CouchbaseRepository.class })
4344
@EnableConfigurationProperties(CouchbaseDataProperties.class)
4445
@Import({ CouchbaseDataConfiguration.class, CouchbaseClientFactoryConfiguration.class,

‎spring-boot-project/spring-boot-data-elasticsearch/src/main/java/org/springframework/boot/data/elasticsearch/autoconfigure/ElasticsearchDataAutoConfiguration.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import org.springframework.boot.autoconfigure.AutoConfiguration;
2020
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2121
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
22+
import org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchClientAutoConfiguration;
23+
import org.springframework.boot.elasticsearch.autoconfigure.ReactiveElasticsearchClientAutoConfiguration;
2224
import org.springframework.context.annotation.Import;
2325
import org.springframework.data.elasticsearch.client.elc.ElasticsearchTemplate;
2426
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
@@ -36,8 +38,7 @@
3638
* @see EnableReactiveElasticsearchRepositories
3739
*/
3840
@AutoConfiguration(
39-
afterName = { "org.springframework.boot.elasticsearch.autoconfigure.ElasticsearchClientAutoConfiguration",
40-
"org.springframework.boot.elasticsearch.autoconfigure.ReactiveElasticsearchClientAutoConfiguration" })
41+
after = { ElasticsearchClientAutoConfiguration.class, ReactiveElasticsearchClientAutoConfiguration.class })
4142
@ConditionalOnClass({ ElasticsearchTemplate.class })
4243
@Import({ ElasticsearchDataConfiguration.BaseConfiguration.class,
4344
ElasticsearchDataConfiguration.JavaClientConfiguration.class,

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
@ConditionalOnClass(DataSource.class)
6262
@ConditionalOnEnabledDevTools
6363
@Conditional(DevToolsDataSourceCondition.class)
64-
@AutoConfiguration(after = DataSourceAutoConfiguration.class)
64+
@AutoConfiguration(afterName = "org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration")
6565
@Import(DatabaseShutdownExecutorEntityManagerFactoryDependsOnConfiguration.class)
6666
public class DevToolsDataSourceAutoConfiguration {
6767

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsR2dbcAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
@ConditionalOnClass(ConnectionFactory.class)
5252
@ConditionalOnEnabledDevTools
5353
@Conditional(DevToolsConnectionFactoryCondition.class)
54-
@AutoConfiguration(after = R2dbcAutoConfiguration.class)
54+
@AutoConfiguration(afterName = "org.springframework.boot.r2dbc.autoconfigure.R2dbcAutoConfiguration")
5555
public class DevToolsR2dbcAutoConfiguration {
5656

5757
@Bean

‎spring-boot-project/spring-boot-elasticsearch/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
1717
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
1818
optional(project(":spring-boot-project:spring-boot-docker-compose"))
19+
optional(project(":spring-boot-project:spring-boot-jsonb"))
1920
optional(project(":spring-boot-project:spring-boot-reactor"))
2021
optional(project(":spring-boot-project:spring-boot-testcontainers"))
2122
optional("co.elastic.clients:elasticsearch-java") {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
org.springframework.boot.graphql.autoconfigure.GraphQlAutoConfiguration
2-
org.springframework.boot.graphql.autoconfigure.data.GraphQlReactiveQueryByExampleAutoConfiguration
3-
org.springframework.boot.graphql.autoconfigure.data.GraphQlReactiveQuerydslAutoConfiguration
42
org.springframework.boot.graphql.autoconfigure.data.GraphQlQueryByExampleAutoConfiguration
53
org.springframework.boot.graphql.autoconfigure.data.GraphQlQuerydslAutoConfiguration
4+
org.springframework.boot.graphql.autoconfigure.data.GraphQlReactiveQueryByExampleAutoConfiguration
5+
org.springframework.boot.graphql.autoconfigure.data.GraphQlReactiveQuerydslAutoConfiguration
66
org.springframework.boot.graphql.autoconfigure.observation.GraphQlObservationAutoConfiguration
77
org.springframework.boot.graphql.autoconfigure.reactive.GraphQlWebFluxAutoConfiguration
88
org.springframework.boot.graphql.autoconfigure.rsocket.GraphQlRSocketAutoConfiguration

‎spring-boot-project/spring-boot-http-converter/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ dependencies {
1515
compileOnly("jakarta.servlet:jakarta.servlet-api")
1616

1717
optional(project(":spring-boot-project:spring-boot-autoconfigure"))
18-
optional("com.fasterxml.jackson.core:jackson-databind")
18+
optional(project(":spring-boot-project:spring-boot-gson"))
19+
optional(project(":spring-boot-project:spring-boot-jackson"))
20+
optional(project(":spring-boot-project:spring-boot-jsonb"))
1921
optional("com.fasterxml.jackson.dataformat:jackson-dataformat-xml")
2022
optional("com.google.code.gson:gson")
2123
optional("jakarta.json.bind:jakarta.json.bind-api")

0 commit comments

Comments
 (0)