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
19 changes: 17 additions & 2 deletions dapr-spring/dapr-spring-boot-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<packaging>jar</packaging>

<properties>
<springboot4.version>4.0.5</springboot4.version>
<springboot4.version>4.0.8</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 @@ -27,7 +27,7 @@
<dependency>
<groupId>tools.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>3.1.1</version>
<version>3.1.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -40,6 +40,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Root-managed Jackson 2 and OpenTelemetry versions; MUST precede the Spring Boot BOM, which manages older, vulnerable versions. -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,27 @@
<packaging>jar</packaging>

<properties>
<springboot4.version>4.0.5</springboot4.version>
<springboot4.version>4.0.8</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- Root-managed Jackson 2 and OpenTelemetry versions; MUST precede the Spring Boot BOM, which manages older, vulnerable versions. -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<packaging>jar</packaging>

<properties>
<springboot4.version>4.0.5</springboot4.version>
<springboot4.version>4.0.8</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand All @@ -32,6 +32,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Root-managed Jackson 2 and OpenTelemetry versions; MUST precede the Spring Boot BOM, which manages older, vulnerable versions. -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
17 changes: 16 additions & 1 deletion dapr-spring/dapr-spring-data/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<packaging>jar</packaging>

<properties>
<springboot4.version>4.0.5</springboot4.version>
<springboot4.version>4.0.8</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,6 +33,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Root-managed Jackson 2 and OpenTelemetry versions; MUST precede the Spring Boot BOM, which manages older, vulnerable versions. -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
37 changes: 26 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<maven.deploy.skip>true</maven.deploy.skip>
<jackson.version>2.21.2</jackson.version>
<jackson.version>2.21.7</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 @@ -52,10 +52,10 @@
<junit-bom.version>5.11.4</junit-bom.version>
<snakeyaml.version>2.0</snakeyaml.version>
<testcontainers.version>2.0.5</testcontainers.version>
<springboot.version>4.0.5</springboot.version>
<springboot.version>4.0.8</springboot.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<assertj.version>3.27.7</assertj.version>
<opentelemetry.version>1.41.0</opentelemetry.version>
<opentelemetry.version>1.62.0</opentelemetry.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 @@ -80,7 +80,7 @@
<kotlin.version>2.1.0</kotlin.version>
<rest-assured.version>5.5.1</rest-assured.version>
<!-- Keep in sync with the Netty version grpc-netty ${grpc.version} is built against (grpc-java SECURITY.md) -->
<netty.version>4.2.16.Final</netty.version>
<netty.version>4.2.17.Final</netty.version>
<!-- TODO: Remove commons-compress override once testcontainers ships with >= 1.26.0 -->
<commons-compress.version>1.26.0</commons-compress.version>
</properties>
Expand Down Expand Up @@ -138,6 +138,22 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<!-- OpenTelemetry and Jackson 3 BOMs imported BEFORE spring-boot-dependencies so they win over the
older, vulnerable versions Spring Boot manages. -->
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>tools.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>3.1.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand All @@ -159,13 +175,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<!-- ====================================================================== -->
<!-- Security overrides - Transitive dependency version fixes for CVEs -->
Expand All @@ -180,6 +189,12 @@
<artifactId>commons-codec</artifactId>
<version>1.17.2</version>
</dependency>
<!-- Spring Boot 4.0.8 still manages a vulnerable Tomcat 11.0.24 -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>11.0.25</version>
</dependency>

<!-- ====================================================================== -->
<!-- Direct dependencies - Only versions not managed by BOMs above -->
Expand Down
12 changes: 10 additions & 2 deletions sdk-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@
<gpg.skip>true</gpg.skip>
<dapr.sdk.version>1.19.0-rc-1</dapr.sdk.version>
<!-- Keep in sync with the Netty version grpc-netty ${grpc.version} is built against (grpc-java SECURITY.md) -->
<netty.version>4.2.16.Final</netty.version>
<jackson.version>2.21.2</jackson.version>
<netty.version>4.2.17.Final</netty.version>
<jackson.version>2.21.7</jackson.version>
<opentelemetry.version>1.62.0</opentelemetry.version>
<!-- TODO: Remove commons-compress override once testcontainers ships with >= 1.26.0 -->
<commons-compress.version>1.26.0</commons-compress.version>
</properties>
Expand Down Expand Up @@ -152,6 +153,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
Expand Down
17 changes: 16 additions & 1 deletion sdk-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<!-- The JaCoCo plugin was expecting coverage for this module, but since it's a test module
and code coverage typically doesn't apply to tests, the coverage is set to 0. -->
<jacoco-maven-plugin.coverage-ratio>0%</jacoco-maven-plugin.coverage-ratio>
<springboot4.version>4.0.5</springboot4.version>
<springboot4.version>4.0.8</springboot4.version>
<!-- Spring Boot 4 ITs (Testcontainers/@SpringBootTest) require JUnit 6; align this test module to it. -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand All @@ -44,6 +44,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Root-managed Jackson 2 and OpenTelemetry versions; MUST precede the Spring Boot BOM, which manages older, vulnerable versions. -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
19 changes: 17 additions & 2 deletions spring-boot-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<springboot4.version>4.0.5</springboot4.version>
<springboot4.version>4.0.8</springboot4.version>
<!-- Override JUnit version to align with Spring Boot 4.x -->
<junit-bom.version>6.0.2</junit-bom.version>
</properties>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>tools.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>3.1.1</version>
<version>3.1.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -44,6 +44,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Root-managed Jackson 2 and OpenTelemetry versions; MUST precede the Spring Boot BOM, which manages older, vulnerable versions. -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
17 changes: 16 additions & 1 deletion spring-boot-sdk-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
<springboot4.version>4.0.5</springboot4.version>
<springboot4.version>4.0.8</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 All @@ -38,6 +38,21 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Root-managed Jackson 2 and OpenTelemetry versions; MUST precede the Spring Boot BOM, which manages older, vulnerable versions. -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>${opentelemetry.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down
Loading