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
6 changes: 0 additions & 6 deletions dapr-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${springboot.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>io.dapr</groupId>
<artifactId>dapr-sdk</artifactId>
Expand Down
67 changes: 65 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
which conflict with dapr-sdk's jackson dependencies
https://github.com/dapr/durabletask-java/blob/main/client/build.gradle#L16
-->
<jackson.version>2.18.6</jackson.version>
<jackson.version>2.21.2</jackson.version>
<gpg.skip>true</gpg.skip>
<spotbugs.fail>true</spotbugs.fail>
<spotbugs.exclude.filter.file>../spotbugs-exclude.xml</spotbugs.exclude.filter.file>
Expand All @@ -53,7 +53,7 @@
<springframework.version>6.2.17</springframework.version>
<!-- Do NOT UPGRADE springframework.version without checking springboot.version alignment -->
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<assertj.version>3.27.3</assertj.version>
<assertj.version>3.27.7</assertj.version>
<grpc.version>1.69.0</grpc.version>
<protobuf.version>3.25.5</protobuf.version>
<opentelemetry.version>1.41.0</opentelemetry.version>
Expand All @@ -67,6 +67,12 @@
<microcks.version>0.3.1</microcks.version>
<!-- TODO: Remove netty-bom override once gRPC ships with Netty >= 4.1.132 (CVE-2026-33871, CVE-2026-33870) -->
<netty.version>4.1.132.Final</netty.version>
<!-- TODO: Remove logback override once Spring Boot 3.4.x ships with logback >= 1.5.25 -->
<logback.version>1.5.25</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.52 -->
<tomcat.version>10.1.52</tomcat.version>
</properties>

<distributionManagement>
Expand Down Expand Up @@ -192,11 +198,68 @@
<artifactId>kafka</artifactId>
<version>${testcontainers.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Spring Framework BOM must precede Spring Boot BOM to override SF version -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${springframework.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${springboot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Security overrides for transitive dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.17.2</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-websocket</artifactId>
<version>${tomcat.version}</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
Expand Down
12 changes: 0 additions & 12 deletions sdk-springboot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@
<name>dapr-sdk-springboot</name>
<description>SDK extension for Springboot</description>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${springboot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Dapr dependencies -->
<dependency>
Expand Down
8 changes: 0 additions & 8 deletions sdk-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,7 @@
</properties>

<dependencyManagement>
<!-- Reproduce a product fixing its own spring boot version -->
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${springboot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions sdk-workflows/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,18 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
11 changes: 0 additions & 11 deletions spring-boot-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,6 @@
<module>workflows</module>
</modules>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${springboot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
Expand Down
5 changes: 5 additions & 0 deletions testcontainers-dapr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
</dependency>
<!-- Required at runtime by commons-compress (optional transitive from testcontainers) -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
</dependencies>

<build>
Expand Down
Loading