Skip to content

Commit 4317d98

Browse files
author
Mark Pollack
committed
Use the SDK's Reactor and Jackson 2 annotations in the Spring Boot modules
Boot 4.1.0's BOM still supplied reactor-core 3.8.6, and importing Jackson 3's BOM first made jackson-annotations 2.21. Import the Reactor BOM and Jackson 2's BOM first, as the parent does. The starter also pins logback to Boot's 1.5.x, as the autoconfigure module does, so logback-classic and logback-core match.
1 parent c205f7b commit 4317d98

2 files changed

Lines changed: 24 additions & 8 deletions

File tree

‎acp-spring-boot-autoconfigure/pom.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
<type>pom</type>
5454
<scope>import</scope>
5555
</dependency>
56-
<!-- The SDK's Jackson, not Boot 4.1.0's 2.21.4 / 3.1.4 (CVE-2026-89407, -89425, -68497,
56+
<!-- The SDK's Reactor and Jackson (Jackson 2's BOM first, so jackson-annotations is 2.x's, as in the parent), not Boot 4.1.0's 2.21.4 / 3.1.4 (CVE-2026-89407, -89425, -68497,
5757
-91776, -91777): the parent's Jackson BOM imports do not win over Boot's here. -->
5858
<dependency>
59-
<groupId>tools.jackson</groupId>
60-
<artifactId>jackson-bom</artifactId>
61-
<version>${jackson3.version}</version>
59+
<groupId>io.projectreactor</groupId>
60+
<artifactId>reactor-bom</artifactId>
61+
<version>${reactor.version}</version>
6262
<type>pom</type>
6363
<scope>import</scope>
6464
</dependency>
@@ -69,6 +69,13 @@
6969
<type>pom</type>
7070
<scope>import</scope>
7171
</dependency>
72+
<dependency>
73+
<groupId>tools.jackson</groupId>
74+
<artifactId>jackson-bom</artifactId>
75+
<version>${jackson3.version}</version>
76+
<type>pom</type>
77+
<scope>import</scope>
78+
</dependency>
7279
<dependency>
7380
<groupId>org.springframework.boot</groupId>
7481
<artifactId>spring-boot-dependencies</artifactId>

‎acp-spring-boot-starter/pom.xml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
<properties>
2020
<spring-boot.version>4.1.0</spring-boot.version>
21+
<!-- Boot 4.1's logback-core is 1.5.x; the parent's logback-classic 1.6 does not run on it. -->
22+
<logback.version>1.5.34</logback.version>
2123
<!-- No code: nothing to cover. -->
2224
<jacoco.skip>true</jacoco.skip>
2325
</properties>
@@ -41,12 +43,12 @@
4143
<type>pom</type>
4244
<scope>import</scope>
4345
</dependency>
44-
<!-- The SDK's Jackson, not Boot 4.1.0's 2.21.4 / 3.1.4 (CVE-2026-89407, -89425, -68497,
46+
<!-- The SDK's Reactor and Jackson (Jackson 2's BOM first, so jackson-annotations is 2.x's, as in the parent), not Boot 4.1.0's 2.21.4 / 3.1.4 (CVE-2026-89407, -89425, -68497,
4547
-91776, -91777): the parent's Jackson BOM imports do not win over Boot's here. -->
4648
<dependency>
47-
<groupId>tools.jackson</groupId>
48-
<artifactId>jackson-bom</artifactId>
49-
<version>${jackson3.version}</version>
49+
<groupId>io.projectreactor</groupId>
50+
<artifactId>reactor-bom</artifactId>
51+
<version>${reactor.version}</version>
5052
<type>pom</type>
5153
<scope>import</scope>
5254
</dependency>
@@ -57,6 +59,13 @@
5759
<type>pom</type>
5860
<scope>import</scope>
5961
</dependency>
62+
<dependency>
63+
<groupId>tools.jackson</groupId>
64+
<artifactId>jackson-bom</artifactId>
65+
<version>${jackson3.version}</version>
66+
<type>pom</type>
67+
<scope>import</scope>
68+
</dependency>
6069
<dependency>
6170
<groupId>org.springframework.boot</groupId>
6271
<artifactId>spring-boot-dependencies</artifactId>

0 commit comments

Comments
 (0)