From 81aa7eabd33b96f71ee443ab813ee542a6190909 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 29 Apr 2014 17:11:26 +0300 Subject: [PATCH] INT-3393: Move Boot AutoConfig to Boot JIRA: https://jira.spring.io/browse/INT-3393 --- .../boot/IntegrationAutoConfiguration.java | 30 ------------------- .../integration/config/boot/package-info.java | 4 --- .../main/resources/META-INF/spring.factories | 2 -- 3 files changed, 36 deletions(-) delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/config/boot/IntegrationAutoConfiguration.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/config/boot/package-info.java diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/boot/IntegrationAutoConfiguration.java b/spring-integration-core/src/main/java/org/springframework/integration/config/boot/IntegrationAutoConfiguration.java deleted file mode 100644 index 1042ee8e17..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/boot/IntegrationAutoConfiguration.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2014 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.config.boot; - -import org.springframework.context.annotation.Configuration; -import org.springframework.integration.config.EnableIntegration; - -/** - * @author Artem Bilan - * @since 4.0 - */ -@Configuration -@EnableIntegration -interface IntegrationAutoConfiguration { - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/boot/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/config/boot/package-info.java deleted file mode 100644 index 39b0e583d1..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/boot/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Contains components for Spring Boot configuration. - */ -package org.springframework.integration.config.boot; diff --git a/spring-integration-core/src/main/resources/META-INF/spring.factories b/spring-integration-core/src/main/resources/META-INF/spring.factories index 5ace75426a..549179dfbe 100644 --- a/spring-integration-core/src/main/resources/META-INF/spring.factories +++ b/spring-integration-core/src/main/resources/META-INF/spring.factories @@ -1,5 +1,3 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.integration.config.boot.IntegrationAutoConfiguration org.springframework.integration.config.IntegrationConfigurationInitializer=\ org.springframework.integration.config.GlobalChannelInterceptorInitializer,\ org.springframework.integration.config.IntegrationConverterInitializer