Skip to content

feat(deps): upgrade to Spring Boot 4 #4558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft

feat(deps): upgrade to Spring Boot 4 #4558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5fe14b7
wip: using unique version for springboot-4 migration based on 3.5.2
Aug 7, 2025
0adf0eb
wip: using unique version for springboot-4 migration based on 3.5.2
Aug 7, 2025
e95c5dc
wip: first version which compiles and no checkstyle warnings
Aug 9, 2025
ca01c07
fix: add .checkstyle from eclipse to .gitignore
Aug 9, 2025
4d48b46
test: Could not find class [org.springframework.boot.mail.autoconfigu…
Aug 10, 2025
0f9b997
test: try to fix endless hanging test
Aug 10, 2025
a29b28d
test: Could not find class [org.springframework.boot.mail.autoconfigu…
Aug 10, 2025
c6403c2
wip: restclient vs. webclient
Aug 11, 2025
f2435d9
wip: using unique version for springboot-4 migration based on 3.5.2
Aug 7, 2025
d86c566
wip: using unique version for springboot-4 migration based on 3.5.2
Aug 7, 2025
62c01c1
wip: first version which compiles and no checkstyle warnings
Aug 9, 2025
4ebf2bd
fix: add .checkstyle from eclipse to .gitignore
Aug 9, 2025
9fa708c
test: Could not find class [org.springframework.boot.mail.autoconfigu…
Aug 10, 2025
abea757
test: try to fix endless hanging test
Aug 10, 2025
1ef675d
test: Could not find class [org.springframework.boot.mail.autoconfigu…
Aug 10, 2025
13573fd
wip: restclient vs. webclient
Aug 11, 2025
36c74fd
Merge branch 'feat/migrate-to-springboot-4' of github.com:ahoehma/spr…
Oct 3, 2025
715f382
wip: move on to springboot 4.0.0-M3 and springcloud 2025.1.0-M2
Oct 3, 2025
06958f3
wip: more code-formatting cleanups (final removed)
Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ target/
.project
.factorypath
.apt_generated/
.checkstyle

# Intellij
.idea/
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<url>https://github.com/codecentric/spring-boot-admin/</url>

<properties>
<revision>3.5.2-SNAPSHOT</revision>
<revision>3.5.6-springboot4-SNAPSHOT</revision>

<java.version>17</java.version>
<node.version>v22.12.0</node.version>
<node.version>v22.14.0</node.version>

<require.maven.version>3.9</require.maven.version>

Expand All @@ -44,10 +44,10 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- used dependencies versions -->
<spring-boot.version>3.5.4</spring-boot.version>
<spring-cloud.version>2025.0.0</spring-cloud.version>
<spring-boot.version>4.0.0-M3</spring-boot.version>
<spring-cloud.version>2025.1.0-M2</spring-cloud.version>

<jolokia-support-spring.version>2.3.0</jolokia-support-spring.version>
<jolokia-support-spring.version>2.3.1-springboot4-SNAPSHOT</jolokia-support-spring.version>

<checkstyle.version>10.26.1</checkstyle.version>
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
Expand Down
29 changes: 24 additions & 5 deletions spring-boot-admin-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,26 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-restclient</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-webclient</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure-processor</artifactId>
Expand All @@ -64,6 +79,10 @@
<artifactId>spring-webflux</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand All @@ -74,11 +93,6 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-standalone</artifactId>
Expand All @@ -89,5 +103,10 @@
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion ...dmin-client/src/main/java/de/codecentric/boot/admin/client/config/ClientRuntimeHints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.RuntimeHintsRegistrar;
import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.boot.web.server.context.WebServerInitializedEvent;
import org.springframework.context.annotation.Configuration;

import de.codecentric.boot.admin.client.registration.Application;
Expand Down
18 changes: 9 additions & 9 deletions .../java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties;
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.http.client.ClientHttpRequestFactoryBuilder;
import org.springframework.boot.http.client.ClientHttpRequestFactorySettings;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.boot.restclient.RestTemplateBuilder;
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
import org.springframework.boot.webflux.autoconfigure.WebFluxProperties;
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletPath;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
Expand All @@ -64,7 +65,6 @@
import de.codecentric.boot.admin.client.registration.metadata.MetadataContributor;
import de.codecentric.boot.admin.client.registration.metadata.StartupDateMetadataContributor;

import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication;

@Configuration(proxyBeanMethods = false)
Expand Down
2 changes: 1 addition & 1 deletion ...ecentric/boot/admin/client/config/SpringBootAdminClientCloudFoundryAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.cloud.CloudPlatform;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/de/codecentric/boot/admin/client/config/SpringNativeClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportRuntimeHints;
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/de/codecentric/boot/admin/client/registration/CloudFoundryApplicationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
import org.springframework.boot.actuate.endpoint.web.PathMappedEndpoints;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
import org.springframework.util.StringUtils;

import de.codecentric.boot.admin.client.config.CloudFoundryApplicationProperties;
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
import org.springframework.boot.actuate.endpoint.EndpointId;
import org.springframework.boot.actuate.endpoint.web.PathMappedEndpoints;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.web.context.WebServerInitializedEvent;
import org.springframework.boot.web.server.Ssl;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
import org.springframework.boot.web.server.context.WebServerInitializedEvent;
import org.springframework.context.event.EventListener;
import org.springframework.lang.Nullable;
import org.springframework.util.StringUtils;
Expand Down Expand Up @@ -162,7 +162,7 @@ protected String getHealthUrl() {
if (this.instance.getHealthUrl() != null) {
return this.instance.getHealthUrl();
}
return UriComponentsBuilder.fromHttpUrl(getManagementBaseUrl())
return UriComponentsBuilder.fromUriString(getManagementBaseUrl())
.path("/")
.path(getHealthEndpointPath())
.toUriString();
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/de/codecentric/boot/admin/client/registration/ReactiveApplicationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
import org.springframework.boot.actuate.endpoint.web.PathMappedEndpoints;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties;
import org.springframework.boot.web.server.Ssl;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
import org.springframework.boot.webflux.autoconfigure.WebFluxProperties;
import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponentsBuilder;

Expand Down
18 changes: 9 additions & 9 deletions ...rc/main/java/de/codecentric/boot/admin/client/registration/ServletApplicationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties;
import org.springframework.boot.actuate.autoconfigure.web.server.ManagementServerProperties;
import org.springframework.boot.actuate.endpoint.web.PathMappedEndpoints;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
import org.springframework.boot.web.server.Ssl;
import org.springframework.boot.web.server.autoconfigure.ServerProperties;
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletPath;
import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponentsBuilder;

Expand Down Expand Up @@ -55,8 +55,8 @@ public ServletApplicationFactory(InstanceProperties instance, ManagementServerPr

@Override
protected String getServiceUrl() {
if (instance.getServiceUrl() != null) {
return instance.getServiceUrl();
if (this.instance.getServiceUrl() != null) {
return this.instance.getServiceUrl();
}

return UriComponentsBuilder.fromUriString(getServiceBaseUrl())
Expand All @@ -67,21 +67,21 @@ protected String getServiceUrl() {

@Override
protected String getManagementBaseUrl() {
String baseUrl = instance.getManagementBaseUrl();
String baseUrl = this.instance.getManagementBaseUrl();

if (StringUtils.hasText(baseUrl)) {
return baseUrl;
}

if (isManagementPortEqual()) {
return UriComponentsBuilder.fromHttpUrl(getServiceUrl())
return UriComponentsBuilder.fromUriString(getServiceUrl())
.path("/")
.path(getDispatcherServletPrefix())
.path(getManagementContextPath())
.toUriString();
}

Ssl ssl = (management.getSsl() != null) ? management.getSsl() : server.getSsl();
Ssl ssl = (this.management.getSsl() != null) ? this.management.getSsl() : this.server.getSsl();
return UriComponentsBuilder.newInstance()
.scheme(getScheme(ssl))
.host(getManagementHost())
Expand All @@ -91,11 +91,11 @@ protected String getManagementBaseUrl() {
}

protected String getManagementContextPath() {
return management.getBasePath();
return this.management.getBasePath();
}

protected String getServerContextPath() {
return servletContext.getContextPath();
return this.servletContext.getContextPath();
}

protected String getDispatcherServletPrefix() {
Expand Down
Loading