Skip to content

Commit 002ec23

Browse files
authored
Merge pull request #49 from datallmhub/fix/stabilize-boot-3.5.14
Stabilize on Spring Boot 3.5.14 + drop the security override hacks
2 parents cb6a604 + 89bbec5 commit 002ec23

1 file changed

Lines changed: 2 additions & 82 deletions

File tree

pom.xml

Lines changed: 2 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -39,97 +39,17 @@
3939
<maven.compiler.target>17</maven.compiler.target>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4141

42-
<spring-boot.version>3.4.13</spring-boot.version>
43-
<spring-ai.version>1.0.7</spring-ai.version>
42+
<spring-boot.version>3.5.14</spring-boot.version>
43+
<spring-ai.version>1.0.8</spring-ai.version>
4444
<resilience4j.version>2.2.0</resilience4j.version>
4545

4646
<junit.version>5.10.2</junit.version>
4747
<assertj.version>3.27.7</assertj.version>
4848
<mockito.version>5.11.0</mockito.version>
49-
50-
<!-- Security overrides: these fix versions are newer than the Spring
51-
Boot 3.3.x BOM pins. Because we import the Boot BOM (rather than
52-
inherit spring-boot-starter-parent), version-property overrides
53-
do not apply — they must be pinned explicitly in
54-
dependencyManagement, ahead of the BOM import, so they win. -->
55-
<jackson-bom.override.version>2.18.6</jackson-bom.override.version>
56-
<logback.override.version>1.5.32</logback.override.version>
57-
<xmlunit.override.version>2.10.0</xmlunit.override.version>
58-
<!-- Web stack: pulled in by the playground (web app) and samples.
59-
Boot 3.3.x pins older tomcat/thymeleaf than the latest CVE fixes. -->
60-
<tomcat.override.version>11.0.22</tomcat.override.version>
61-
<thymeleaf.override.version>3.1.5.RELEASE</thymeleaf.override.version>
62-
<!-- Spring Framework: Boot 3.4.13 pins 6.2.15; bump to 6.2.18 to clear
63-
the spring-webmvc / spring-webflux advisories (fixed in 6.2.18). -->
64-
<spring-framework.override.version>6.2.18</spring-framework.override.version>
6549
</properties>
6650

6751
<dependencyManagement>
6852
<dependencies>
69-
<!-- Security overrides — declared BEFORE the Spring Boot BOM so
70-
they take precedence over the versions it manages. Each fixes
71-
a Dependabot advisory whose patched version the 3.3.x BOM does
72-
not yet pin. -->
73-
<dependency>
74-
<groupId>com.fasterxml.jackson</groupId>
75-
<artifactId>jackson-bom</artifactId>
76-
<version>${jackson-bom.override.version}</version>
77-
<type>pom</type>
78-
<scope>import</scope>
79-
</dependency>
80-
<dependency>
81-
<groupId>ch.qos.logback</groupId>
82-
<artifactId>logback-core</artifactId>
83-
<version>${logback.override.version}</version>
84-
</dependency>
85-
<dependency>
86-
<groupId>ch.qos.logback</groupId>
87-
<artifactId>logback-classic</artifactId>
88-
<version>${logback.override.version}</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.xmlunit</groupId>
92-
<artifactId>xmlunit-core</artifactId>
93-
<version>${xmlunit.override.version}</version>
94-
</dependency>
95-
<dependency>
96-
<groupId>org.assertj</groupId>
97-
<artifactId>assertj-core</artifactId>
98-
<version>${assertj.version}</version>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.apache.tomcat.embed</groupId>
102-
<artifactId>tomcat-embed-core</artifactId>
103-
<version>${tomcat.override.version}</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>org.apache.tomcat.embed</groupId>
107-
<artifactId>tomcat-embed-el</artifactId>
108-
<version>${tomcat.override.version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.apache.tomcat.embed</groupId>
112-
<artifactId>tomcat-embed-websocket</artifactId>
113-
<version>${tomcat.override.version}</version>
114-
</dependency>
115-
<dependency>
116-
<groupId>org.thymeleaf</groupId>
117-
<artifactId>thymeleaf</artifactId>
118-
<version>${thymeleaf.override.version}</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>org.thymeleaf</groupId>
122-
<artifactId>thymeleaf-spring6</artifactId>
123-
<version>${thymeleaf.override.version}</version>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.springframework</groupId>
127-
<artifactId>spring-framework-bom</artifactId>
128-
<version>${spring-framework.override.version}</version>
129-
<type>pom</type>
130-
<scope>import</scope>
131-
</dependency>
132-
13353
<dependency>
13454
<groupId>org.springframework.boot</groupId>
13555
<artifactId>spring-boot-dependencies</artifactId>

0 commit comments

Comments
 (0)