Skip to content

Commit fe1dc32

Browse files
committed
Reduce depth of starter dependencies
Rework a few of the starter POMs to reduce the import depth. Closes gh-46548
1 parent 8827e29 commit fe1dc32

File tree

57 files changed

+225
-30
lines changed

Some content is hidden

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

57 files changed

+225
-30
lines changed

integration-test/spring-boot-server-integration-tests/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
testRepository(project(path: ":build-plugin:spring-boot-gradle-plugin", configuration: "mavenRepository"))
3636
testRepository(project(path: ":starter:spring-boot-starter", configuration: "mavenRepository"))
3737
testRepository(project(path: ":starter:spring-boot-starter-jetty", configuration: "mavenRepository"))
38-
testRepository(project(path: ":starter:spring-boot-starter-json", configuration: "mavenRepository"))
38+
testRepository(project(path: ":starter:spring-boot-starter-jackson", configuration: "mavenRepository"))
3939
testRepository(project(path: ":starter:spring-boot-starter-parent", configuration: "mavenRepository"))
4040
testRepository(project(path: ":starter:spring-boot-starter-tomcat", configuration: "mavenRepository"))
4141
testRepository(project(path: ":starter:spring-boot-starter-undertow", configuration: "mavenRepository"))
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the License);
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
plugins {
18+
id "java"
19+
}
20+
21+
description = "Spring Boot Auto-Configure Classic smoke test"
22+
23+
dependencies {
24+
implementation(project(":starter:spring-boot-starter"))
25+
implementation(project(":module:spring-boot-autoconfigure-classic"))
26+
27+
testImplementation(project(":starter:spring-boot-starter-test"))
28+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package smoketest.autoconfigureclassic;
18+
19+
import org.springframework.boot.CommandLineRunner;
20+
import org.springframework.boot.SpringApplication;
21+
import org.springframework.boot.autoconfigure.SpringBootApplication;
22+
23+
@SpringBootApplication
24+
public class SampleAutoConfigureClassicApplication implements CommandLineRunner {
25+
26+
@Override
27+
public void run(String... args) throws Exception {
28+
System.out.println("Auto-Configure Classic!");
29+
}
30+
31+
public static void main(String[] args) {
32+
SpringApplication.run(SampleAutoConfigureClassicApplication.class, args);
33+
}
34+
35+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
test.name=Phil
2+
sample.name=Andy
3+
4+
spring.profiles.validate=false
5+
spring.profiles.active=a+very(silly)!name
6+
61.6 KB
Loading
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
${Ansi.GREEN} :: Sample application build with Spring Boot${spring-boot.formatted-version} ::${Ansi.DEFAULT}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/*
2+
* Copyright 2012-present the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package smoketest.autoconfigureclassic;
18+
19+
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.api.extension.ExtendWith;
21+
22+
import org.springframework.boot.test.system.CapturedOutput;
23+
import org.springframework.boot.test.system.OutputCaptureExtension;
24+
25+
import static org.assertj.core.api.Assertions.assertThat;
26+
27+
/**
28+
* Tests for {@link SampleAutoConfigureClassicApplication}.
29+
*
30+
* @author Phillip Webb
31+
*/
32+
@ExtendWith(OutputCaptureExtension.class)
33+
class SampleAutoConfigureClassicApplicationTests {
34+
35+
@Test
36+
void testApplicationRuns(CapturedOutput output) {
37+
SampleAutoConfigureClassicApplication.main(new String[0]);
38+
assertThat(output).contains("Auto-Configure Classic!");
39+
}
40+
41+
}

smoke-test/spring-boot-smoke-test-kafka/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ configurations.all {
3232
}
3333

3434
dependencies {
35-
implementation(project(":starter:spring-boot-starter-json"))
35+
implementation(project(":starter:spring-boot-starter-jackson"))
3636
implementation(project(":starter:spring-boot-starter-kafka"))
3737

3838
dockerTestImplementation(project(":starter:spring-boot-starter-test"))

starter/spring-boot-starter-activemq/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ plugins {
2121
description = "Starter for using Apache ActiveMQ and JMS"
2222

2323
dependencies {
24-
api(project(":starter:spring-boot-starter-jms"))
24+
api(project(":starter:spring-boot-starter"))
2525

2626
api(project(":module:spring-boot-activemq"))
27+
api(project(":module:spring-boot-jms"))
2728
}

starter/spring-boot-starter-artemis/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ plugins {
2121
description = "Starter for Apache Artemis and JMS"
2222

2323
dependencies {
24-
api(project(":starter:spring-boot-starter-jms"))
24+
api(project(":starter:spring-boot-starter"))
2525

2626
api(project(":module:spring-boot-artemis"))
27+
api(project(":module:spring-boot-jms"))
2728
}

0 commit comments

Comments
 (0)