Skip to content

Commit 4f10afd

Browse files
wilkinsonaphilwebb
authored andcommitted
Break the link between spring-boot-test and spring-boot-all
1 parent 2d7a58e commit 4f10afd

File tree

57 files changed

+25
-24
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

+25
-24
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ dependencies {
4242
optional("org.apache.groovy:groovy")
4343
optional("org.apache.groovy:groovy-xml")
4444
optional("org.crac:crac")
45-
optional("org.eclipse.jetty:jetty-client")
4645
optional("org.hamcrest:hamcrest-library")
4746
optional("org.hibernate.orm:hibernate-core")
4847
optional("org.hibernate.validator:hibernate-validator")

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

spring-boot-project/spring-boot-test/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
description = "Spring Boot Test"
1010

1111
dependencies {
12-
api(project(":spring-boot-project:spring-boot-all"))
12+
api(project(":spring-boot-project:spring-boot"))
1313
api("org.springframework:spring-test")
1414

1515
optional("com.fasterxml.jackson.core:jackson-databind")

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,14 @@ dependencies {
2121
optional("com.google.code.gson:gson")
2222
optional("jakarta.servlet:jakarta.servlet-api")
2323
optional("jakarta.validation:jakarta.validation-api")
24+
optional("io.projectreactor.netty:reactor-netty-http")
2425
optional("org.apache.groovy:groovy")
26+
optional("org.apache.httpcomponents.client5:httpclient5")
2527
optional("org.apache.logging.log4j:log4j-api")
2628
optional("org.apache.logging.log4j:log4j-core")
2729
optional("org.apache.logging.log4j:log4j-jul")
2830
optional("org.crac:crac")
31+
optional("org.eclipse.jetty:jetty-client")
2932
optional("org.jetbrains.kotlin:kotlin-reflect")
3033
optional("org.jetbrains.kotlin:kotlin-stdlib")
3134
optional("org.slf4j:jul-to-slf4j")

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java renamed to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/AbstractClientHttpRequestFactoryBuilder.java

File renamed without changes.

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java renamed to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryBuilder.java

File renamed without changes.

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java renamed to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactoryRuntimeHints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2024 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.

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java renamed to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/ClientHttpRequestFactorySettings.java

File renamed without changes.

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/Empty.java renamed to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/Empty.java

File renamed without changes.

spring-boot-project/spring-boot-all/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java renamed to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/http/client/HttpClientSettings.java

File renamed without changes.

0 commit comments

Comments
 (0)