Skip to content

Commit 62a01f5

Browse files
CopilotNetyyyy
Copilot
and
Netyyyy
committed
Add Spring Boot 4.x support infrastructure
- Added Spring Milestones repository to sdk/spring/pom.xml - Updated _constants.py to support Spring Boot 4 version tagging - Added SPRING_BOOT_MAJOR_4_VERSION_NAME support to sync_external_dependencies.py - Generated spring_boot_4.0.0-RC2_managed_external_dependencies.txt - Added springboot4_ prefixed dependencies to external_dependencies.txt Co-authored-by: Netyyyy <[email protected]>
1 parent 3b08b4d commit 62a01f5

File tree

5 files changed

+1854
-4
lines changed

5 files changed

+1854
-4
lines changed

‎eng/versioning/external_dependencies.txt‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,3 +424,81 @@ java7support_com.fasterxml.jackson.core:jackson-core;2.13.5
424424
java7support_com.fasterxml.jackson.core:jackson-databind;2.13.5
425425
org.mockito:mockito-junit-jupiter;4.11.0
426426
com.github.tomakehurst:wiremock-jre8;2.35.2
427+
428+
# Spring Boot 4 dependencies
429+
springboot4_ch.qos.logback:logback-classic;1.5.20
430+
springboot4_com.fasterxml.jackson.core:jackson-annotations;2.20
431+
springboot4_com.fasterxml.jackson.core:jackson-core;2.20.1
432+
springboot4_com.fasterxml.jackson.core:jackson-databind;2.20.1
433+
springboot4_com.fasterxml.jackson.dataformat:jackson-dataformat-xml;2.20.1
434+
springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jdk8;2.20.1
435+
springboot4_com.fasterxml.jackson.datatype:jackson-datatype-jsr310;2.20.1
436+
springboot4_com.fasterxml.jackson.module:jackson-module-afterburner;2.20.1
437+
springboot4_com.fasterxml.jackson.module:jackson-module-parameter-names;2.20.1
438+
springboot4_com.mysql:mysql-connector-j;9.4.0
439+
springboot4_io.lettuce:lettuce-core;6.8.1.RELEASE
440+
springboot4_io.netty:netty-buffer;4.2.7.Final
441+
springboot4_io.netty:netty-codec-http;4.2.7.Final
442+
springboot4_io.netty:netty-common;4.2.7.Final
443+
springboot4_io.netty:netty-handler;4.2.7.Final
444+
springboot4_io.netty:netty-transport;4.2.7.Final
445+
springboot4_io.netty:netty-transport-native-epoll;4.2.7.Final
446+
springboot4_io.netty:netty-transport-native-kqueue;4.2.7.Final
447+
springboot4_io.projectreactor.netty:reactor-netty;1.3.0-RC1
448+
springboot4_io.projectreactor:reactor-test;3.8.0-RC1
449+
springboot4_jakarta.annotation:jakarta.annotation-api;3.0.0
450+
springboot4_jakarta.servlet:jakarta.servlet-api;6.1.0
451+
springboot4_jakarta.validation:jakarta.validation-api;3.1.1
452+
springboot4_junit:junit;4.13.2
453+
springboot4_net.bytebuddy:byte-buddy;1.17.8
454+
springboot4_net.bytebuddy:byte-buddy-agent;1.17.8
455+
springboot4_org.apache.commons:commons-lang3;3.19.0
456+
springboot4_org.apache.kafka:kafka-clients;4.1.0
457+
springboot4_org.apache.maven.plugins:maven-antrun-plugin;3.2.0
458+
springboot4_org.apache.maven.plugins:maven-compiler-plugin;3.14.1
459+
springboot4_org.apache.maven.plugins:maven-enforcer-plugin;3.6.2
460+
springboot4_org.apache.maven.plugins:maven-failsafe-plugin;3.5.4
461+
springboot4_org.apache.maven.plugins:maven-jar-plugin;3.4.2
462+
springboot4_org.apache.maven.plugins:maven-javadoc-plugin;3.12.0
463+
springboot4_org.apache.maven.plugins:maven-surefire-plugin;3.5.4
464+
springboot4_org.assertj:assertj-core;3.27.6
465+
springboot4_org.hibernate.validator:hibernate-validator;9.0.1.Final
466+
springboot4_org.junit.jupiter:junit-jupiter;6.0.1
467+
springboot4_org.junit.vintage:junit-vintage-engine;6.0.1
468+
springboot4_org.messaginghub:pooled-jms;3.1.7
469+
springboot4_org.mockito:mockito-core;5.20.0
470+
springboot4_org.postgresql:postgresql;42.7.8
471+
springboot4_org.slf4j:slf4j-api;2.0.17
472+
springboot4_org.slf4j:slf4j-simple;2.0.17
473+
springboot4_org.springframework.boot:spring-boot-actuator;4.0.0-RC2
474+
springboot4_org.springframework.boot:spring-boot-actuator-autoconfigure;4.0.0-RC2
475+
springboot4_org.springframework.boot:spring-boot-autoconfigure;4.0.0-RC2
476+
springboot4_org.springframework.boot:spring-boot-configuration-metadata;4.0.0-RC2
477+
springboot4_org.springframework.boot:spring-boot-configuration-processor;4.0.0-RC2
478+
springboot4_org.springframework.boot:spring-boot-dependencies;4.0.0-RC2
479+
springboot4_org.springframework.boot:spring-boot-docker-compose;4.0.0-RC2
480+
springboot4_org.springframework.boot:spring-boot-starter;4.0.0-RC2
481+
springboot4_org.springframework.boot:spring-boot-starter-actuator;4.0.0-RC2
482+
springboot4_org.springframework.boot:spring-boot-starter-data-jdbc;4.0.0-RC2
483+
springboot4_org.springframework.boot:spring-boot-starter-integration;4.0.0-RC2
484+
springboot4_org.springframework.boot:spring-boot-starter-parent;4.0.0-RC2
485+
springboot4_org.springframework.boot:spring-boot-starter-test;4.0.0-RC2
486+
springboot4_org.springframework.boot:spring-boot-starter-web;4.0.0-RC2
487+
springboot4_org.springframework.boot:spring-boot-test;4.0.0-RC2
488+
springboot4_org.springframework.boot:spring-boot-testcontainers;4.0.0-RC2
489+
springboot4_org.springframework.cloud:spring-cloud-dependencies;2025.1.0-M4
490+
springboot4_org.springframework.integration:spring-integration-core;7.0.0-RC2
491+
springboot4_org.springframework.kafka:spring-kafka;4.0.0-RC1
492+
springboot4_org.springframework:spring-beans;7.0.0-RC3
493+
springboot4_org.springframework:spring-context;7.0.0-RC3
494+
springboot4_org.springframework:spring-context-support;7.0.0-RC3
495+
springboot4_org.springframework:spring-core;7.0.0-RC3
496+
springboot4_org.springframework:spring-core-test;7.0.0-RC3
497+
springboot4_org.springframework:spring-expression;7.0.0-RC3
498+
springboot4_org.springframework:spring-jdbc;7.0.0-RC3
499+
springboot4_org.springframework:spring-jms;7.0.0-RC3
500+
springboot4_org.springframework:spring-messaging;7.0.0-RC3
501+
springboot4_org.springframework:spring-test;7.0.0-RC3
502+
springboot4_org.springframework:spring-tx;7.0.0-RC3
503+
springboot4_org.springframework:spring-web;7.0.0-RC3
504+
springboot4_org.springframework:spring-webmvc;7.0.0-RC3

‎sdk/spring/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,28 @@
88
<packaging>pom</packaging>
99
<version>1.0.0</version><!-- Need not change for every release-->
1010

11+
<repositories>
12+
<repository>
13+
<id>spring-milestones</id>
14+
<name>Spring Milestones</name>
15+
<url>https://repo.spring.io/milestone</url>
16+
<snapshots>
17+
<enabled>false</enabled>
18+
</snapshots>
19+
</repository>
20+
</repositories>
21+
22+
<pluginRepositories>
23+
<pluginRepository>
24+
<id>spring-milestones</id>
25+
<name>Spring Milestones</name>
26+
<url>https://repo.spring.io/milestone</url>
27+
<snapshots>
28+
<enabled>false</enabled>
29+
</snapshots>
30+
</pluginRepository>
31+
</pluginRepositories>
32+
1133
<profiles>
1234
<profile>
1335
<id>default</id>

‎sdk/spring/scripts/_constants.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
SPRING_BOOT_MAJOR_2_VERSION_TAG_PREFIX = ''
44
SPRING_BOOT_MAJOR_3_VERSION_NAME = '3'
55
SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX = 'springboot3_'
6+
SPRING_BOOT_MAJOR_4_VERSION_NAME = '4'
7+
SPRING_BOOT_MAJOR_4_VERSION_TAG_PREFIX = 'springboot4_'
68
SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT = {
79
SPRING_BOOT_MAJOR_2_VERSION_NAME: SPRING_BOOT_MAJOR_2_VERSION_TAG_PREFIX,
8-
SPRING_BOOT_MAJOR_3_VERSION_NAME: SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX
10+
SPRING_BOOT_MAJOR_3_VERSION_NAME: SPRING_BOOT_MAJOR_3_VERSION_TAG_PREFIX,
11+
SPRING_BOOT_MAJOR_4_VERSION_NAME: SPRING_BOOT_MAJOR_4_VERSION_TAG_PREFIX
912
}
1013

1114

1215
def get_spring_boot_version_tag_prefix(spring_boot_version):
13-
if spring_boot_version.startswith('3.') or spring_boot_version == SPRING_BOOT_MAJOR_3_VERSION_NAME:
16+
if spring_boot_version.startswith('4.') or spring_boot_version == SPRING_BOOT_MAJOR_4_VERSION_NAME:
17+
return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_4_VERSION_NAME]
18+
elif spring_boot_version.startswith('3.') or spring_boot_version == SPRING_BOOT_MAJOR_3_VERSION_NAME:
1419
return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_3_VERSION_NAME]
1520
elif spring_boot_version.startswith('2.') or spring_boot_version == SPRING_BOOT_MAJOR_2_VERSION_NAME:
1621
return SPRING_BOOT_MAJOR_VERSION_PREFIX_DICT[SPRING_BOOT_MAJOR_2_VERSION_NAME]

0 commit comments

Comments
 (0)