Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion dapr-spring/dapr-spring-6-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
<!-- Must be >= 4.0.6 for CVE-2026-40973 -->
<springboot4.version>4.0.6</springboot4.version>
<springboot4.version>4.0.9</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions dapr-spring/dapr-spring-boot-4-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<!-- Must be >= 4.0.6 for CVE-2026-40973 -->
<springboot4.version>4.0.6</springboot4.version>
<springboot4.version>4.0.9</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.0.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>tools.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>3.1.4</version>
<version>3.1.8</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<!-- Must be >= 4.0.6 for CVE-2026-40973 -->
<springboot4.version>4.0.6</springboot4.version>
<springboot4.version>4.0.9</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<!-- Must be >= 4.0.6 for CVE-2026-40973 -->
<springboot4.version>4.0.6</springboot4.version>
<springboot4.version>4.0.9</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand Down
43 changes: 35 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<maven.deploy.skip>true</maven.deploy.skip>
<jackson.version>2.21.5</jackson.version>
<jackson.version>2.21.8</jackson.version>
<gpg.skip>true</gpg.skip>
<spotbugs.fail>true</spotbugs.fail>
<spotbugs.exclude.filter.file>${maven.multiModuleProjectDirectory}/spotbugs-exclude.xml</spotbugs.exclude.filter.file>
Expand All @@ -59,8 +59,12 @@
<assertj.version>3.27.7</assertj.version>
<!-- Must be >= 1.62.0 for CVE-2026-45292 -->
<opentelemetry.version>1.62.0</opentelemetry.version>
<!-- Must be >= 6.2.18 for CVE-2026-22735, CVE-2026-22737, CVE-2026-22741, CVE-2026-22745 -->
<spring-framework.version>6.2.18</spring-framework.version>
<!-- Must be >= 6.2.19 for CVE-2026-41841..41846, CVE-2026-41848, CVE-2026-41850..41854 -->
<spring-framework.version>6.2.19</spring-framework.version>
<!-- Must be >= 2025.0.12 (spring-data-commons 3.5.12) for CVE-2026-41695, CVE-2026-41716 -->
<spring-data.version>2025.0.13</spring-data.version>
<!-- Must be >= 1.15.12 for CVE-2026-40983, CVE-2026-40984 -->
<micrometer.version>1.15.12</micrometer.version>
<wiremock.version>3.9.1</wiremock.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
Expand All @@ -84,14 +88,16 @@
<opentelemetry-bom.version>2.1.0</opentelemetry-bom.version>
<kotlin.version>2.1.0</kotlin.version>
<rest-assured.version>5.5.1</rest-assured.version>
<!-- TODO: Remove netty-bom override once gRPC ships with Netty >= 4.1.135 (CVE-2026-33871, CVE-2026-33870 and later fixes) -->
<netty.version>4.1.135.Final</netty.version>
<!-- TODO: Remove netty-bom override once gRPC ships with Netty >= 4.1.139 (CVE-2026-75595 and later fixes) -->
<netty.version>4.1.139.Final</netty.version>
<!-- TODO: Remove logback override once Spring Boot 3.4.x ships with logback >= 1.5.35 -->
<logback.version>1.5.35</logback.version>
<!-- TODO: Remove commons-compress override once testcontainers ships with >= 1.26.0 -->
<commons-compress.version>1.26.0</commons-compress.version>
<!-- TODO: Remove tomcat override once Spring Boot 3.4.x ships with tomcat >= 10.1.55 -->
<tomcat.version>10.1.55</tomcat.version>
<!-- TODO: Remove tomcat override once Spring Boot 3.4.x ships with tomcat >= 10.1.61 -->
<tomcat.version>10.1.61</tomcat.version>
<!-- TODO: Remove guava override once protobuf-java-util ships with guava >= 33.7.2 (CVE-2026-102554) -->
<guava.version>33.7.2-jre</guava.version>
</properties>

<distributionManagement>
Expand Down Expand Up @@ -144,14 +150,30 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- TODO: Remove spring-framework override once Spring Boot ships with spring-framework >= 6.2.18 (CVE-2026-22735, CVE-2026-22737, CVE-2026-22741, CVE-2026-22745) -->
<!-- TODO: Remove spring-framework override once Spring Boot ships with spring-framework >= 6.2.19 (CVE-2026-41841..41854) -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring-framework.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- TODO: Remove spring-data override once Spring Boot ships with spring-data >= 2025.0.12 (CVE-2026-41695, CVE-2026-41716) -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-bom</artifactId>
<version>${spring-data.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- TODO: Remove micrometer override once Spring Boot ships with micrometer >= 1.15.12 (CVE-2026-40983, CVE-2026-40984) -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-bom</artifactId>
<version>${micrometer.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down Expand Up @@ -199,6 +221,11 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down
12 changes: 10 additions & 2 deletions spring-boot-4-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<!-- Must be >= 4.0.6 for CVE-2026-40973 -->
<springboot4.version>4.0.6</springboot4.version>
<springboot4.version>4.0.9</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand All @@ -33,7 +33,15 @@
<dependency>
<groupId>tools.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>3.1.4</version>
<version>3.1.8</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Override OTel for CVE-2026-45292 (must precede SB BOM) -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-4-sdk-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
<!-- Must be >= 4.0.6 for CVE-2026-40973 -->
<springboot4.version>4.0.6</springboot4.version>
<springboot4.version>4.0.9</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
<!-- The JaCoCo plugin was expecting coverage for this module, but since it's a test module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import io.dapr.workflows.WorkflowStub;
import io.dapr.spring.workflows.config.annotations.ActivityMetadata;
import io.dapr.spring.workflows.config.annotations.WorkflowMetadata;
import org.checkerframework.checker.units.qual.C;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
Expand Down
Loading