Skip to content

Compatible Spring Boot 4 #4

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

Closed
SavitarC wants to merge 9 commits into from
Closed

Compatible Spring Boot 4 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3241d9c
feat(spring-boot): Add Spring Boot 4 support
SavitarC May 12, 2026
0d78fec
fix(spring-boot): Add Boot 4 profiles and smoke paths
SavitarC May 13, 2026
2d54642
Merge branch 'apache:3.3' into compatible-spring-boot-4
SavitarC May 13, 2026
8e171e6
fix(spring-boot): Guard Zipkin RestTemplateBuilder on Boot 4
SavitarC May 16, 2026
1e7425d
feat(spring-boot): Add Boot 4 API compatibility paths
SavitarC May 17, 2026
236e9f4
fix(spring-boot): Isolate Boot 3 profile dependencies
SavitarC May 17, 2026
e3463d4
fix: correct Boot 4 Zipkin and REST profile config
SavitarC May 18, 2026
2c9e1ea
fix(spring-boot): guard Boot 4 auto configuration checks
SavitarC May 18, 2026
b033582
fix: order zipkin auto-config after spring boot class
SavitarC May 18, 2026
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
2 changes: 2 additions & 0 deletions .artifacts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ dubbo-spring-boot-actuator-autoconfigure
dubbo-spring-boot-actuator-compatible
dubbo-spring-boot-autoconfigure
dubbo-spring-boot-3-autoconfigure
dubbo-spring-boot-4-autoconfigure
dubbo-spring-boot-autoconfigure-compatible
dubbo-spring-boot-actuator-autoconfigure-compatible
dubbo-spring-boot-compatible
Expand All @@ -103,6 +104,7 @@ dubbo-tracing-otel-zipkin-spring-boot-starter
dubbo-tracing-otel-otlp-spring-boot-starter
dubbo-observability-spring-boot-starter
dubbo-spring-boot-starter
dubbo-spring-boot-4-starter
dubbo-spring-boot-starters
dubbo-spring-boot-interceptor
dubbo-nacos-spring-boot-starter
Expand Down
9 changes: 9 additions & 0 deletions dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

public class Slf4jLoggerAdapter implements LoggerAdapter {
public static final String NAME = "slf4j";
private static final String NOP_LOGGER_FACTORY = "org.slf4j.helpers.NOPLoggerFactory";

private Level level;
private File file;
Expand Down Expand Up @@ -82,6 +83,14 @@ public void setFile(File file) {

@Override
public boolean isConfigured() {
try {
Object loggerFactory = LoggerFactory.getILoggerFactory();
return loggerFactory != null
&& !NOP_LOGGER_FACTORY.equals(loggerFactory.getClass().getName());
} catch (Throwable ignore) {
// Fallback for unusual SLF4J initialization failures.
}

try {
ClassUtils.forName("org.slf4j.impl.StaticLoggerBinder");
return true;
Expand Down
8 changes: 5 additions & 3 deletions dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConcurrentHashMapUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
import java.util.concurrent.ConcurrentHashMap;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.DisabledOnJre;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
Expand All @@ -39,7 +41,7 @@ public void testComputeIfAbsent() {
}

@Test
@EnabledForJreRange(max = org.junit.jupiter.api.condition.JRE.JAVA_8)
@EnabledOnJre(JRE.JAVA_8)
public void issue11986ForJava8Test() {
// https://github.com/apache/dubbo/issues/11986
final ConcurrentHashMap<String, Integer> map = new ConcurrentHashMap<>();
Expand All @@ -54,7 +56,7 @@ public void issue11986ForJava8Test() {
}

@Test
@EnabledForJreRange(min = org.junit.jupiter.api.condition.JRE.JAVA_9)
@DisabledOnJre(JRE.JAVA_8)
public void issue11986ForJava17Test() {
// https://github.com/apache/dubbo/issues/11986
final ConcurrentHashMap<String, Integer> map = new ConcurrentHashMap<>();
Expand Down
4 changes: 2 additions & 2 deletions dubbo-common/src/test/java/org/apache/dubbo/common/utils/NetUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ void testMatchIpRangeMatchWhenIpv6Exception() {
@Test
void testMatchIpRangeMatchWhenIpWrongException() {
UnknownHostException thrown = assertThrows(
UnknownHostException.class, () -> NetUtils.matchIpRange("192.168.1.63", "192.168.1.ff", 90));
assertTrue(thrown.getMessage().contains("192.168.1.ff"));
UnknownHostException.class, () -> NetUtils.matchIpRange("192.168.1.63", "192.168.1.256", 90));
assertTrue(thrown.getMessage().contains("192.168.1.256"));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions dubbo-compatible/src/test/java/org/apache/dubbo/metadata/rest/SpringRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public String form(@RequestParam("f") String form) {
}

@Override
@PostMapping(value = "/request/body/map", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "/request/body/map", produces = MediaType.APPLICATION_JSON_VALUE)
public User requestBodyMap(@RequestBody Map<String, Object> data, @RequestParam("param") String param) {
User user = new User();
user.setId(((Integer) data.get("id")).longValue());
Expand All @@ -84,7 +84,7 @@ public User requestBodyMap(@RequestBody Map<String, Object> data, @RequestParam(
return user;
}

@PostMapping(value = "/request/body/user", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
@PostMapping(value = "/request/body/user", consumes = MediaType.APPLICATION_JSON_VALUE)
@Override
public Map<String, Object> requestBodyUser(@RequestBody User user) {
Map<String, Object> map = new HashMap<>();
Expand Down
63 changes: 63 additions & 0 deletions dubbo-config/dubbo-config-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,56 @@
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
<spring-boot.version>2.7.18</spring-boot.version>
<spring-boot.tomcat.version>9.0.117</spring-boot.tomcat.version>
<!-- Uncomment spring_version property to check Spring 4.x compatibility -->
<!-- <spring_version>4.3.30.RELEASE</spring_version> -->
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test-autoconfigure</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${spring-boot.tomcat.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
Expand Down Expand Up @@ -248,4 +294,21 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>spring-boot-4</id>
<properties>
<spring-boot.version>${spring-boot-4.version}</spring-boot.version>
<spring-boot.tomcat.version>${tomcat.version}</spring-boot.tomcat.version>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/dubbo/config/spring/context/DubboDeployApplicationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ private void publishModuleEvent(DeployState state, Throwable cause) {

@Override
public void onApplicationEvent(ApplicationContextEvent event) {
if (nullSafeEquals(applicationContext, event.getSource())) {
if (nullSafeEquals(applicationContext, event.getApplicationContext())) {
if (event instanceof ContextRefreshedEvent) {
onContextRefreshedEvent((ContextRefreshedEvent) event);
} else if (event instanceof ContextClosedEvent) {
Expand Down
21 changes: 17 additions & 4 deletions dubbo-demo/dubbo-demo-mcp-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@

<profiles>
<profile>
<id>jdk-version-ge-17</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<id>spring-boot-3</id>
<properties>
<spring-boot-maven-plugin.version>${spring-boot-3.version}</spring-boot-maven-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
Expand All @@ -149,5 +149,18 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>spring-boot-4</id>
<properties>
<spring-boot-maven-plugin.version>${spring-boot-4.version}</spring-boot-maven-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-4-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
28 changes: 28 additions & 0 deletions dubbo-demo/dubbo-demo-spring-boot-idl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,32 @@
</extension>
</extensions>
</build>
<profiles>
<profile>
<id>spring-boot-3</id>
<properties>
<spring-boot.version>${spring-boot-3.version}</spring-boot.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-3-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>spring-boot-4</id>
<properties>
<spring-boot.version>${spring-boot-4.version}</spring-boot.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-4-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
15 changes: 11 additions & 4 deletions dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-servlet/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,7 @@

<profiles>
<profile>
<id>jdk-version-ge-17</id>
<activation>
<jdk>[17,)</jdk>
</activation>
<id>spring-boot-3</id>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
Expand All @@ -134,5 +131,15 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>spring-boot-4</id>
<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-4-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
11 changes: 9 additions & 2 deletions dubbo-demo/dubbo-demo-spring-boot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,15 @@
<profile>
<id>spring-boot-3</id>
<properties>
<spring-boot.version>3.2.1</spring-boot.version>
<spring-boot-maven-plugin.version>3.2.1</spring-boot-maven-plugin.version>
<spring-boot.version>${spring-boot-3.version}</spring-boot.version>
<spring-boot-maven-plugin.version>${spring-boot-3.version}</spring-boot-maven-plugin.version>
</properties>
</profile>
<profile>
<id>spring-boot-4</id>
<properties>
<spring-boot.version>${spring-boot-4.version}</spring-boot.version>
<spring-boot-maven-plugin.version>${spring-boot-4.version}</spring-boot-maven-plugin.version>
</properties>
</profile>
</profiles>
Expand Down
10 changes: 10 additions & 0 deletions dubbo-distribution/dubbo-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,11 @@
<artifactId>dubbo-spring-boot-3-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-4-autoconfigure</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-compatible</artifactId>
Expand All @@ -519,6 +524,11 @@
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot-4-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot</artifactId>
Expand Down
44 changes: 44 additions & 0 deletions dubbo-plugin/dubbo-rest-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@

<artifactId>dubbo-rest-spring</artifactId>

<properties>
<spring-boot.source.dir>src/spring-boot-before-4/java</spring-boot.source.dir>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
Expand Down Expand Up @@ -113,10 +117,50 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-spring-boot-sources</id>
<goals>
<goal>add-source</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<sources>
<source>${spring-boot.source.dir}</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>spring-boot-before-4</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<spring-boot.source.dir>src/spring-boot-before-4/java</spring-boot.source.dir>
</properties>
</profile>
<profile>
<id>spring-boot-4</id>
<properties>
<spring-boot.source.dir>src/spring-boot-4/java</spring-boot.source.dir>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>rpc-rest-test</id>
<dependencies>
Expand Down
Loading
Loading