From 3db2d570c731cb2cb40fdec81c3172b6d5be4807 Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Fri, 26 Sep 2025 10:59:46 -0700 Subject: [PATCH 1/4] Centralize Maven dependency version management - Add missing version properties to parent POM - Convert hardcoded dependency versions to properties in parent dependencyManagement - Remove hardcoded versions from child modules - Add missing dependencies to parent dependencyManagement - Ensure all shared dependencies inherit versions from parent Signed-off-by: Artur Ciocanu --- examples/pom.xml | 6 +- pom.xml | 88 +++++++++++++++++-- sdk-actors/pom.xml | 2 - sdk-autogen/pom.xml | 3 - sdk-workflows/pom.xml | 3 - sdk/pom.xml | 8 +- .../workflows/multi-app/orchestrator/pom.xml | 1 - .../workflows/multi-app/worker-one/pom.xml | 1 - .../workflows/multi-app/worker-two/pom.xml | 1 - 9 files changed, 85 insertions(+), 28 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 9aab1aee51..bbcf54306c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -30,7 +30,6 @@ commons-cli commons-cli - 1.9.0 io.grpc @@ -66,7 +65,6 @@ com.jayway.jsonpath json-path - 2.9.0 io.opentelemetry @@ -111,7 +109,6 @@ org.junit.platform junit-platform-console-standalone - 1.7.0 compile @@ -137,12 +134,11 @@ com.evanlennick retry4j - 0.15.0 javax.annotation javax.annotation-api - 1.3.2 + ${javax.annotation.version} com.google.protobuf diff --git a/pom.xml b/pom.xml index 8c9caa57e1..3ce55ee5db 100644 --- a/pom.xml +++ b/pom.xml @@ -62,8 +62,26 @@ 3.18.0 1.9.0 2.14.0 + 1.7 3.4.0 0.3.1 + 2.9.0 + 0.15.0 + 1.19.0 + 2.1.1 + 4.2.0 + 5.7.0 + 1.7.0 + 3.5.12 + 1.5.10 + 2.2.2 + 2.0.9 + 3.11.2 + 3.5.12 + 2.1.0 + 5.5.1 + 2.1.0 + 5.5.1 @@ -87,7 +105,7 @@ org.slf4j slf4j-api - 2.0.9 + ${slf4j.version} io.grpc @@ -111,12 +129,12 @@ org.mockito mockito-core - 3.11.2 + ${mockito.version} io.projectreactor reactor-test - 3.5.12 + ${reactor-test.version} test @@ -134,7 +152,7 @@ org.jetbrains.kotlin kotlin-stdlib - 2.1.0 + ${kotlin.version} org.yaml @@ -201,7 +219,7 @@ io.rest-assured rest-assured - 5.5.1 + ${rest-assured.version} io.dapr.spring @@ -371,6 +389,66 @@ wiremock-standalone ${wiremock.version} + + commons-validator + commons-validator + ${commons-validator.version} + + + com.jayway.jsonpath + json-path + ${json-path.version} + + + com.evanlennick + retry4j + ${retry4j.version} + + + com.github.stefanbirkner + system-rules + ${system-rules.version} + + + uk.org.webcompere + system-stubs-jupiter + ${system-stubs.version} + + + org.mockito + mockito-inline + ${mockito-inline.version} + + + org.junit.vintage + junit-vintage-engine + ${junit-vintage-engine.version} + + + org.junit.platform + junit-platform-console-standalone + ${junit-platform-console.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + io.projectreactor + reactor-core + ${reactor.version} + + + io.dapr + durabletask-client + ${durabletask-client.version} + + + com.redis + testcontainers-redis + ${testcontainers-redis.version} + diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml index 494dc7e626..b930d960ea 100644 --- a/sdk-actors/pom.xml +++ b/sdk-actors/pom.xml @@ -39,7 +39,6 @@ commons-cli commons-cli - 1.9.0 test @@ -57,7 +56,6 @@ commons-validator commons-validator - 1.7 test diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index 0204568769..19d0f60c1d 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -21,15 +21,12 @@ ${project.build.directory}/generated-sources ${project.build.directory}/proto false - 1.69.0 - 3.25.5 javax.annotation javax.annotation-api - 1.3.2 provided diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml index 3792008268..4aeb864bff 100644 --- a/sdk-workflows/pom.xml +++ b/sdk-workflows/pom.xml @@ -30,7 +30,6 @@ org.mockito mockito-inline - 4.2.0 test @@ -41,13 +40,11 @@ org.junit.vintage junit-vintage-engine - 5.7.0 test io.dapr durabletask-client - 1.5.10 1.17.0-SNAPSHOT - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - io.dapr dapr-sdk @@ -85,81 +76,12 @@ dapr-sdk-springboot ${dapr.sdk.version} - - org.springframework - spring-context - ${springframework.version} - - - org.springframework - spring-beans - ${springframework.version} - - - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework.boot - spring-boot-configuration-processor - ${springboot.version} - - - org.springframework.boot - spring-boot-starter - ${springboot.version} - - - org.springframework.boot - spring-boot-autoconfigure-processor - ${springboot.version} - io.dapr.spring dapr-spring-boot-tests ${dapr.spring.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.springframework.boot - spring-boot-starter-test - ${springboot.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - org.testcontainers - junit-jupiter - ${testcontainers.version} - test - diff --git a/examples/pom.xml b/examples/pom.xml index bbcf54306c..96b7d0c7dd 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-examples jar - 1.17.0-SNAPSHOT dapr-sdk-examples @@ -22,8 +21,6 @@ ${java.version} ${java.version} false - 1.41.0 - 3.4.0 @@ -34,33 +31,27 @@ io.grpc grpc-protobuf - ${grpc.version} io.grpc grpc-stub - ${grpc.version} io.grpc grpc-api - ${grpc.version} io.grpc grpc-testing - ${grpc.version} test com.google.protobuf protobuf-java-util - ${protobuf.version} org.springframework.boot spring-boot-starter-web - ${springboot.version} com.jayway.jsonpath @@ -69,32 +60,26 @@ io.opentelemetry opentelemetry-sdk - ${opentelemetry.version} io.opentelemetry opentelemetry-exporter-logging - ${opentelemetry.version} io.opentelemetry opentelemetry-sdk-metrics - ${opentelemetry.version} io.opentelemetry opentelemetry-exporter-zipkin - ${opentelemetry.version} io.zipkin.reporter2 zipkin-reporter - ${zipkin.version} io.zipkin.reporter2 zipkin-sender-urlconnection - ${zipkin.version} org.junit.jupiter @@ -138,12 +123,10 @@ javax.annotation javax.annotation-api - ${javax.annotation.version} com.google.protobuf protobuf-java - ${protobuf.version} diff --git a/pom.xml b/pom.xml index 3ce55ee5db..13f9b2d683 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,6 @@ 2.2.2 2.0.9 3.11.2 - 3.5.12 2.1.0 5.5.1 2.1.0 @@ -134,7 +133,7 @@ io.projectreactor reactor-test - ${reactor-test.version} + ${reactor.version} test @@ -308,6 +307,26 @@ grpc-stub ${grpc.version} + + io.grpc + grpc-netty + ${grpc.version} + + + io.grpc + grpc-netty-shaded + ${grpc.version} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.google.protobuf + protobuf-java-util + ${protobuf.version} + commons-io commons-io @@ -434,6 +453,16 @@ jackson-databind ${jackson.version} + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + io.projectreactor reactor-core diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml index b930d960ea..0ee3a827a3 100644 --- a/sdk-actors/pom.xml +++ b/sdk-actors/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-actors jar - 1.17.0-SNAPSHOT dapr-sdk-actors SDK for Actors on Dapr @@ -44,13 +43,11 @@ org.springframework.boot spring-boot-starter-web - ${springboot.version} test io.grpc grpc-testing - ${grpc.version} test diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index 19d0f60c1d..f8dbc2987f 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-autogen jar - 1.17.0-SNAPSHOT dapr-sdk-autogen Auto-generated SDK for Dapr @@ -32,23 +31,19 @@ io.grpc grpc-netty-shaded - ${grpc.version} runtime io.grpc grpc-protobuf - ${grpc.version} io.grpc grpc-stub - ${grpc.version} io.grpc grpc-testing - ${grpc.version} test diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml index cf287499b3..295b7ae255 100644 --- a/sdk-springboot/pom.xml +++ b/sdk-springboot/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-springboot jar - 1.17.0-SNAPSHOT dapr-sdk-springboot SDK extension for Springboot diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 6a3bafface..553e4a9a8d 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -11,19 +11,14 @@ dapr-sdk-tests - 1.17.0-SNAPSHOT dapr-sdk-tests Tests for Dapr's Java SDK - not to be published as a jar. - UTF-8 17 17 - 17 17 true - 1.17.0-SNAPSHOT - 0.17.0-SNAPSHOT ${project.build.directory}/generated-sources ${project.basedir}/proto diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml index 4aeb864bff..3afb38c40f 100644 --- a/sdk-workflows/pom.xml +++ b/sdk-workflows/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-workflows jar - 1.17.0-SNAPSHOT dapr-sdk-workflows SDK for Workflows on Dapr @@ -54,22 +53,18 @@ com.fasterxml.jackson.core jackson-core - ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jackson.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson.version} diff --git a/sdk/pom.xml b/sdk/pom.xml index 36dc31914d..6bfecd2584 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -12,7 +12,6 @@ dapr-sdk jar - 1.17.0-SNAPSHOT dapr-sdk SDK for Dapr @@ -50,7 +49,6 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - ${jackson.version} test @@ -76,13 +74,11 @@ org.springframework.boot spring-boot-starter-web - ${springboot.version} test org.springframework.boot spring-boot-autoconfigure - ${springboot.version} test @@ -118,18 +114,15 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - ${jackson.version} test org.assertj assertj-core - ${assertj.version} io.grpc grpc-netty - ${grpc.version} diff --git a/spring-boot-examples/pom.xml b/spring-boot-examples/pom.xml index 69cbd693e6..198d71b355 100644 --- a/spring-boot-examples/pom.xml +++ b/spring-boot-examples/pom.xml @@ -10,7 +10,6 @@ spring-boot-examples - 1.17.0-SNAPSHOT pom diff --git a/spring-boot-examples/workflows/multi-app/pom.xml b/spring-boot-examples/workflows/multi-app/pom.xml index 6586459001..e066d03373 100644 --- a/spring-boot-examples/workflows/multi-app/pom.xml +++ b/spring-boot-examples/workflows/multi-app/pom.xml @@ -10,7 +10,6 @@ multi-app - 1.17.0-SNAPSHOT pom diff --git a/spring-boot-examples/workflows/patterns/pom.xml b/spring-boot-examples/workflows/patterns/pom.xml index e4742686bc..b6382cc0db 100644 --- a/spring-boot-examples/workflows/patterns/pom.xml +++ b/spring-boot-examples/workflows/patterns/pom.xml @@ -43,7 +43,6 @@ io.github.microcks microcks-testcontainers - ${microcks.version} test diff --git a/spring-boot-examples/workflows/pom.xml b/spring-boot-examples/workflows/pom.xml index db4dc6f485..d3d0f6c837 100644 --- a/spring-boot-examples/workflows/pom.xml +++ b/spring-boot-examples/workflows/pom.xml @@ -10,7 +10,6 @@ workflows - 1.17.0-SNAPSHOT pom diff --git a/testcontainers-dapr/pom.xml b/testcontainers-dapr/pom.xml index 56a0d11167..9b78aeb9e9 100644 --- a/testcontainers-dapr/pom.xml +++ b/testcontainers-dapr/pom.xml @@ -11,7 +11,6 @@ testcontainers-dapr testcontainers-dapr Testcontainers Dapr Module - 1.17.0-SNAPSHOT jar From 1d38e79788ee7f9d3321ec9d6c578d1154420dcb Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Fri, 26 Sep 2025 13:18:26 -0700 Subject: [PATCH 3/4] Fix some version management issues. Signed-off-by: Artur Ciocanu --- dapr-spring/pom.xml | 8 +++++++- pom.xml | 31 +++++++++++++++++++++++++------ sdk-autogen/pom.xml | 3 +-- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index dbe0a089df..969af293cf 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -36,6 +36,13 @@ + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + io.dapr dapr-sdk @@ -81,7 +88,6 @@ dapr-spring-boot-tests ${dapr.spring.version} - diff --git a/pom.xml b/pom.xml index 13f9b2d683..3cc71a7dd0 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,6 @@ 2.0.9 3.11.2 2.1.0 - 5.5.1 2.1.0 5.5.1 @@ -245,6 +244,11 @@ spring-boot-starter-test ${springboot.version} + + org.springframework.boot + spring-boot-autoconfigure + ${springboot.version} + org.springframework.data spring-data-keyvalue @@ -312,11 +316,6 @@ grpc-netty ${grpc.version} - - io.grpc - grpc-netty-shaded - ${grpc.version} - com.google.protobuf protobuf-java @@ -463,6 +462,16 @@ jackson-datatype-jsr310 ${jackson.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + io.projectreactor reactor-core @@ -478,6 +487,16 @@ testcontainers-redis ${testcontainers-redis.version} + + io.github.microcks + microcks-testcontainers + ${microcks.version} + + + org.assertj + assertj-core + ${assertj.version} + diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index f8dbc2987f..cd37138cc8 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -30,8 +30,7 @@ io.grpc - grpc-netty-shaded - runtime + grpc-netty io.grpc From 3ddc4dff590998d51f82bafd85b4293b215d1d8a Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Fri, 26 Sep 2025 17:15:36 -0700 Subject: [PATCH 4/4] Optimize Dapr Spring version management. Signed-off-by: Artur Ciocanu --- dapr-spring/pom.xml | 27 --------------------------- examples/pom.xml | 2 +- pom.xml | 3 +-- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 969af293cf..fc602c3f22 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -36,28 +36,6 @@ - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - io.dapr - dapr-sdk - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-actors - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-workflows - ${dapr.sdk.version} - io.dapr.spring dapr-spring-data @@ -78,11 +56,6 @@ dapr-spring-boot-autoconfigure ${dapr.spring.version} - - io.dapr - dapr-sdk-springboot - ${dapr.sdk.version} - io.dapr.spring dapr-spring-boot-tests diff --git a/examples/pom.xml b/examples/pom.xml index 96b7d0c7dd..413d7c45ce 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -109,7 +109,7 @@ io.dapr dapr-sdk-workflows - ${dapr.sdk.version} + ${project.version} io.dapr diff --git a/pom.xml b/pom.xml index 3cc71a7dd0..0a6a5360e2 100644 --- a/pom.xml +++ b/pom.xml @@ -53,8 +53,6 @@ 1.7.0 3.27.3 - 1.69.0 - 3.25.5 1.41.0 3.9.1 2.1.1 @@ -203,6 +201,7 @@ spring-boot-dependencies ${springboot.version} pom + import org.testcontainers