Skip to content

Commit 9a1027a

Browse files
wilkinsonawilkinsona
committed
Create spring-boot-integration module
1 parent 1fcc9c8 commit 9a1027a

File tree

29 files changed

+67
-38
lines changed

29 files changed

+67
-38
lines changed

‎settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ include "spring-boot-project:spring-boot-elasticsearch"
5656
include "spring-boot-project:spring-boot-flyway"
5757
include "spring-boot-project:spring-boot-freemarker"
5858
include "spring-boot-project:spring-boot-groovy-templates"
59+
include "spring-boot-project:spring-boot-integration"
5960
include "spring-boot-project:spring-boot-jackson"
6061
include "spring-boot-project:spring-boot-jdbc"
6162
include "spring-boot-project:spring-boot-jetty"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ dependencies {
2323
optional(project(":spring-boot-project:spring-boot-data-jpa"))
2424
optional(project(":spring-boot-project:spring-boot-elasticsearch"))
2525
optional(project(":spring-boot-project:spring-boot-flyway"))
26+
optional(project(":spring-boot-project:spring-boot-integration"))
2627
optional(project(":spring-boot-project:spring-boot-jackson"))
2728
optional(project(":spring-boot-project:spring-boot-jdbc"))
2829
optional(project(":spring-boot-project:spring-boot-jetty"))
@@ -141,7 +142,6 @@ dependencies {
141142
exclude group: "commons-logging", module: "commons-logging"
142143
}
143144
optional("org.springframework.graphql:spring-graphql")
144-
optional("org.springframework.integration:spring-integration-core")
145145
optional("org.springframework.kafka:spring-kafka")
146146
optional("org.springframework.security:spring-security-config")
147147
optional("org.springframework.security:spring-security-web")

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
26-
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
2726
import org.springframework.context.annotation.Bean;
2827
import org.springframework.integration.config.IntegrationConfigurationBeanFactoryPostProcessor;
2928
import org.springframework.integration.graph.IntegrationGraphServer;
@@ -36,7 +35,7 @@
3635
* @author Stephane Nicoll
3736
* @since 2.1.0
3837
*/
39-
@AutoConfiguration(after = IntegrationAutoConfiguration.class)
38+
@AutoConfiguration(afterName = "org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration")
4039
@ConditionalOnClass(IntegrationGraphServer.class)
4140
@ConditionalOnBean(IntegrationConfigurationBeanFactoryPostProcessor.class)
4241
@ConditionalOnAvailableEndpoint(IntegrationGraphEndpoint.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfiguration.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
2222
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
2323
import org.springframework.boot.autoconfigure.AutoConfiguration;
2424
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
25-
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
2625

2726
/**
2827
* {@link EnableAutoConfiguration Auto-configuration} for Spring Integration's metrics.
@@ -32,8 +31,8 @@
3231
*
3332
* @author Andy Wilkinson
3433
*/
35-
@AutoConfiguration(after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class },
36-
before = IntegrationAutoConfiguration.class)
34+
@AutoConfiguration(beforeName = "org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration",
35+
after = { MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class })
3736
class IntegrationMetricsAutoConfiguration {
3837

3938
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integration/IntegrationGraphEndpointAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import org.springframework.boot.actuate.integration.IntegrationGraphEndpoint;
2222
import org.springframework.boot.autoconfigure.AutoConfigurations;
23-
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
2423
import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
24+
import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration;
2525
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2626
import org.springframework.integration.graph.IntegrationGraphServer;
2727

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/integration/IntegrationMetricsAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.springframework.boot.actuate.autoconfigure.integration.IntegrationGraphEndpointAutoConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
2525
import org.springframework.boot.autoconfigure.AutoConfigurations;
26-
import org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration;
26+
import org.springframework.boot.integration.autoconfigure.IntegrationAutoConfiguration;
2727
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2828

2929
import static org.assertj.core.api.Assertions.assertThat;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies {
2525

2626
optional(project(":spring-boot-project:spring-boot-activemq"))
2727
optional(project(":spring-boot-project:spring-boot-flyway"))
28+
optional(project(":spring-boot-project:spring-boot-integration"))
2829
optional(project(":spring-boot-project:spring-boot-jdbc"))
2930
optional(project(":spring-boot-project:spring-boot-jetty"))
3031
optional(project(":spring-boot-project:spring-boot-jsonb"))
@@ -94,7 +95,6 @@ dependencies {
9495
optional("org.springframework.data:spring-data-mongodb")
9596
optional("org.springframework.data:spring-data-redis")
9697
optional("org.springframework.data:spring-data-rest-webmvc")
97-
optional("org.springframework.integration:spring-integration-core")
9898
optional("org.springframework.security:spring-security-core")
9999
optional("org.springframework.security:spring-security-web")
100100
optional("org.springframework.session:spring-session-core")

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ dependencies {
159159
optional("org.opensaml:opensaml-saml-api:4.0.1")
160160
optional("org.opensaml:opensaml-saml-impl:4.0.1")
161161
optional("org.quartz-scheduler:quartz")
162-
optional("org.springframework.integration:spring-integration-core")
163-
optional("org.springframework.integration:spring-integration-jdbc")
164-
optional("org.springframework.integration:spring-integration-jmx")
165-
optional("org.springframework.integration:spring-integration-rsocket")
166162
optional("org.springframework:spring-aspects")
167163
optional("org.springframework:spring-jdbc")
168164
optional("org.springframework:spring-jms")

‎spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/spring.factories

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
# Environment Post Processors
2-
org.springframework.boot.env.EnvironmentPostProcessor=\
3-
org.springframework.boot.autoconfigure.integration.IntegrationPropertiesEnvironmentPostProcessor
4-
51
# Background Preinitializers
62
org.springframework.boot.autoconfigure.preinitialize.BackgroundPreinitializer=\
73
org.springframework.boot.autoconfigure.http.MessageConverterBackgroundPreinitializer

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ org.springframework.boot.autoconfigure.hazelcast.HazelcastJpaDependencyAutoConfi
5151
org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration
5252
org.springframework.boot.autoconfigure.http.client.HttpClientAutoConfiguration
5353
org.springframework.boot.autoconfigure.http.codec.CodecsAutoConfiguration
54-
org.springframework.boot.autoconfigure.integration.IntegrationAutoConfiguration
5554
org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration
5655
org.springframework.boot.autoconfigure.jooq.JooqAutoConfiguration
5756
org.springframework.boot.autoconfigure.ldap.embedded.EmbeddedLdapAutoConfiguration

0 commit comments

Comments
 (0)