diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index ba6386724ea..2ab37d99e72 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -1988,7 +1988,6 @@ bom { "spring-boot-amqp", "spring-boot-artemis", "spring-boot-autoconfigure", - "spring-boot-autoconfigure-classic", "spring-boot-autoconfigure-processor", "spring-boot-batch", "spring-boot-buildpack-platform", diff --git a/settings.gradle b/settings.gradle index fc4a7c4f9ec..4cd0fede7ea 100644 --- a/settings.gradle +++ b/settings.gradle @@ -79,7 +79,6 @@ include "module:spring-boot-actuator" include "module:spring-boot-actuator-autoconfigure" include "module:spring-boot-amqp" include "module:spring-boot-artemis" -include "module:spring-boot-autoconfigure-classic" include "module:spring-boot-batch" include "module:spring-boot-cache" include "module:spring-boot-cassandra" @@ -285,7 +284,6 @@ include ":smoke-test:spring-boot-smoke-test-amqp" include ":smoke-test:spring-boot-smoke-test-ant" include ":smoke-test:spring-boot-smoke-test-aop" include ":smoke-test:spring-boot-smoke-test-artemis" -include ":smoke-test:spring-boot-smoke-test-autoconfigure-classic" include ":smoke-test:spring-boot-smoke-test-batch" include ":smoke-test:spring-boot-smoke-test-bootstrap-registry" include ":smoke-test:spring-boot-smoke-test-cache" diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/build.gradle b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/build.gradle deleted file mode 100644 index df9ee7ae997..00000000000 --- a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2012-present 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 - * - * https://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. - */ - -plugins { - id "java" -} - -description = "Spring Boot Auto-Configure Classic smoke test" - -dependencies { - implementation(project(":starter:spring-boot-starter")) - implementation(project(":module:spring-boot-autoconfigure-classic")) - - testImplementation(project(":starter:spring-boot-starter-test")) -} diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplication.java b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplication.java deleted file mode 100644 index 18d641e1224..00000000000 --- a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplication.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2012-present 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 - * - * https://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 smoketest.autoconfigureclassic; - -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class SampleAutoConfigureClassicApplication implements CommandLineRunner { - - @Override - public void run(String... args) throws Exception { - System.out.println("Auto-Configure Classic!"); - } - - public static void main(String[] args) { - SpringApplication.run(SampleAutoConfigureClassicApplication.class, args); - } - -} diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/application.properties b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/application.properties deleted file mode 100644 index bfd3a3a2ac8..00000000000 --- a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/application.properties +++ /dev/null @@ -1,6 +0,0 @@ -test.name=Phil -sample.name=Andy - -spring.profiles.validate=false -spring.profiles.active=a+very(silly)!name - diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.jpg b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.jpg deleted file mode 100644 index f196fed2c3f..00000000000 Binary files a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.jpg and /dev/null differ diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.txt b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.txt deleted file mode 100644 index 2634c44793a..00000000000 --- a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/main/resources/banner.txt +++ /dev/null @@ -1 +0,0 @@ -${Ansi.GREEN} :: Sample application build with Spring Boot${spring-boot.formatted-version} ::${Ansi.DEFAULT} diff --git a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/test/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplicationTests.java b/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/test/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplicationTests.java deleted file mode 100644 index a514859ec57..00000000000 --- a/smoke-test/spring-boot-smoke-test-autoconfigure-classic/src/test/java/smoketest/autoconfigureclassic/SampleAutoConfigureClassicApplicationTests.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2012-present 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 - * - * https://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 smoketest.autoconfigureclassic; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import org.springframework.boot.test.system.CapturedOutput; -import org.springframework.boot.test.system.OutputCaptureExtension; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests for {@link SampleAutoConfigureClassicApplication}. - * - * @author Phillip Webb - */ -@ExtendWith(OutputCaptureExtension.class) -class SampleAutoConfigureClassicApplicationTests { - - @Test - void testApplicationRuns(CapturedOutput output) { - SampleAutoConfigureClassicApplication.main(new String[0]); - assertThat(output).contains("Auto-Configure Classic!"); - } - -}