From b1c3a8b052cd1f3b54b9a5fe6df0f1593e4dcacb Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Tue, 25 Nov 2025 01:41:55 -0800 Subject: [PATCH 1/7] Another set of Maven version, properties and plugin improvements Signed-off-by: Artur Ciocanu --- .mise.toml | 5 ++++ dapr-spring/pom.xml | 6 ++-- examples/pom.xml | 6 ++-- pom.xml | 55 +++++++++++++++++++++++-------------- sdk-actors/pom.xml | 8 +++--- sdk-autogen/pom.xml | 8 +++--- sdk-springboot/pom.xml | 8 +++--- sdk-tests/pom.xml | 6 ++-- sdk-workflows/pom.xml | 8 +++--- sdk/pom.xml | 8 +++--- testcontainers-dapr/pom.xml | 2 ++ 11 files changed, 70 insertions(+), 50 deletions(-) create mode 100644 .mise.toml diff --git a/.mise.toml b/.mise.toml new file mode 100644 index 000000000..6daaf4e4c --- /dev/null +++ b/.mise.toml @@ -0,0 +1,5 @@ +[tools] +java = "temurin-17" + +[env] +JAVA_HOME = "{{exec(command='mise where java')}}" diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index fc602c3f2..b62864875 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -73,7 +73,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.1 + ${maven-sources-plugin.version} attach-sources @@ -87,7 +87,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} true @@ -104,7 +104,7 @@ org.jacoco jacoco-maven-plugin - 0.8.12 + ${jacoco-maven-plugin.version} default-prepare-agent diff --git a/examples/pom.xml b/examples/pom.xml index 413d7c45c..daa770b19 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -135,7 +135,7 @@ org.xolstice.maven.plugins protobuf-maven-plugin - 0.6.1 + ${protobuf-maven-plugin.version} com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java @@ -154,7 +154,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + ${maven-compiler-plugin.version} ${java.version} @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 + ${maven-site-plugin.version} true diff --git a/pom.xml b/pom.xml index b45636c3e..8669d784b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,9 +25,19 @@ 2.7 3.3.1 3.13.0 - 3.2.1 + 3.3.1 + 3.7.0 + 0.6.1 + 1.6.0 0.8.11 80% + 3.1.0 + 3.4.0 + 10.17.0 + 4.8.2.0 + 3.12.1 + 2.9 + 3.2.0 11 11 11 @@ -532,7 +542,7 @@ kr.motd.maven os-maven-plugin - 1.7.1 + ${os-maven-plugin.version} @@ -639,6 +649,21 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + org.xolstice.maven.plugins + protobuf-maven-plugin + ${protobuf-maven-plugin.version} + + + com.googlecode.maven-download-plugin + download-maven-plugin + ${download-maven-plugin.version} + @@ -647,22 +672,10 @@ nexus-staging-maven-plugin false - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - - prepare-agent - - - - org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + ${maven-gpg-plugin.version} sign-artifacts @@ -683,7 +696,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.4.0 + ${maven-checkstyle-plugin.version} checkstyle.xml .java_header @@ -709,14 +722,14 @@ com.puppycrawl.tools checkstyle - 10.17.0 + ${checkstyle.version} com.github.spotbugs spotbugs-maven-plugin - 4.8.2.0 + ${spotbugs-maven-plugin.version} ${spotbugs.exclude.filter.file} ${spotbugs.fail} @@ -735,7 +748,7 @@ org.apache.maven.plugins maven-site-plugin - 3.8.2 + ${maven-site-plugin.version} @@ -745,7 +758,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 + ${maven-project-info-reports-plugin.version} @@ -756,7 +769,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} aggregate diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml index 0ee3a827a..de6ec38f3 100644 --- a/sdk-actors/pom.xml +++ b/sdk-actors/pom.xml @@ -66,7 +66,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + ${maven-sources-plugin.version} attach-sources @@ -80,7 +80,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} true @@ -96,7 +96,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + ${jacoco-maven-plugin.version} default-prepare-agent @@ -127,7 +127,7 @@ LINE COVEREDRATIO - 80% + ${jacoco-maven-plugin.coverage-ratio} diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index cd37138cc..8c81fc572 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -56,7 +56,7 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.6.0 + ${download-maven-plugin.version} getDaprProto @@ -102,7 +102,7 @@ org.xolstice.maven.plugins protobuf-maven-plugin - 0.6.1 + ${protobuf-maven-plugin.version} com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + ${maven-sources-plugin.version} attach-sources @@ -134,7 +134,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} true diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml index 8e9b4bb85..7aabe3a51 100644 --- a/sdk-springboot/pom.xml +++ b/sdk-springboot/pom.xml @@ -69,7 +69,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.1 + ${maven-sources-plugin.version} attach-sources @@ -83,7 +83,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.7.0 + ${maven-javadoc-plugin.version} true @@ -100,7 +100,7 @@ org.jacoco jacoco-maven-plugin - 0.8.12 + ${jacoco-maven-plugin.version} default-prepare-agent @@ -134,7 +134,7 @@ LINE COVEREDRATIO - 80% + ${jacoco-maven-plugin.coverage-ratio} diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 1b66f0807..4fc670f0f 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -256,7 +256,7 @@ org.xolstice.maven.plugins protobuf-maven-plugin - 0.6.1 + ${protobuf-maven-plugin.version} com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} grpc-java @@ -275,7 +275,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + ${maven-jar-plugin.version} @@ -287,7 +287,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.2.2 + ${failsafe.version} diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml index 3afb38c40..696a3ec0d 100644 --- a/sdk-workflows/pom.xml +++ b/sdk-workflows/pom.xml @@ -77,7 +77,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + ${maven-sources-plugin.version} attach-sources @@ -91,7 +91,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} true @@ -107,7 +107,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + ${jacoco-maven-plugin.version} default-prepare-agent @@ -138,7 +138,7 @@ LINE COVEREDRATIO - 80% + ${jacoco-maven-plugin.coverage-ratio} diff --git a/sdk/pom.xml b/sdk/pom.xml index f77de232d..5106b287f 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -155,7 +155,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + ${maven-sources-plugin.version} attach-sources @@ -168,7 +168,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} true @@ -184,7 +184,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + ${jacoco-maven-plugin.version} default-prepare-agent @@ -215,7 +215,7 @@ LINE COVEREDRATIO - 80% + ${jacoco-maven-plugin.coverage-ratio} diff --git a/testcontainers-dapr/pom.xml b/testcontainers-dapr/pom.xml index 9b78aeb9e..0e6026ff1 100644 --- a/testcontainers-dapr/pom.xml +++ b/testcontainers-dapr/pom.xml @@ -43,6 +43,7 @@ org.apache.maven.plugins maven-source-plugin + ${maven-sources-plugin.version} attach-sources @@ -55,6 +56,7 @@ org.apache.maven.plugins maven-javadoc-plugin + ${maven-javadoc-plugin.version} true From 47126fb65ca8e00af90bbfafb7d19a356de2d226 Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Tue, 25 Nov 2025 02:30:48 -0800 Subject: [PATCH 2/7] Remove plugin duplicates Signed-off-by: Artur Ciocanu --- .../dapr-spring-boot-autoconfigure/pom.xml | 1 + dapr-spring/dapr-spring-boot-tests/pom.xml | 1 + dapr-spring/dapr-spring-data/pom.xml | 1 + dapr-spring/dapr-spring-messaging/pom.xml | 1 + dapr-spring/dapr-spring-workflows/pom.xml | 1 + dapr-spring/pom.xml | 41 +-- examples/pom.xml | 1 + pom.xml | 325 ++++-------------- sdk-actors/pom.xml | 63 +--- sdk-autogen/pom.xml | 1 + sdk-springboot/pom.xml | 41 +-- sdk-tests/pom.xml | 1 + sdk-workflows/pom.xml | 63 +--- sdk/pom.xml | 40 +-- spring-boot-examples/consumer-app/pom.xml | 1 + spring-boot-examples/pom.xml | 1 + spring-boot-examples/producer-app/pom.xml | 1 + .../workflows/multi-app/orchestrator/pom.xml | 1 + .../workflows/multi-app/pom.xml | 1 + .../workflows/multi-app/worker-one/pom.xml | 1 + .../workflows/multi-app/worker-two/pom.xml | 1 + .../workflows/patterns/pom.xml | 1 + spring-boot-examples/workflows/pom.xml | 1 + testcontainers-dapr/pom.xml | 22 +- 24 files changed, 93 insertions(+), 519 deletions(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 7cec5fce6..7afe00e7d 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -7,6 +7,7 @@ io.dapr.spring dapr-spring-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-spring-boot-autoconfigure diff --git a/dapr-spring/dapr-spring-boot-tests/pom.xml b/dapr-spring/dapr-spring-boot-tests/pom.xml index 5cb08b9bf..e463802f8 100644 --- a/dapr-spring/dapr-spring-boot-tests/pom.xml +++ b/dapr-spring/dapr-spring-boot-tests/pom.xml @@ -7,6 +7,7 @@ io.dapr.spring dapr-spring-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-spring-boot-tests diff --git a/dapr-spring/dapr-spring-data/pom.xml b/dapr-spring/dapr-spring-data/pom.xml index b41c7c85f..7beafa478 100644 --- a/dapr-spring/dapr-spring-data/pom.xml +++ b/dapr-spring/dapr-spring-data/pom.xml @@ -7,6 +7,7 @@ io.dapr.spring dapr-spring-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-spring-data diff --git a/dapr-spring/dapr-spring-messaging/pom.xml b/dapr-spring/dapr-spring-messaging/pom.xml index 90a73c904..26342138b 100644 --- a/dapr-spring/dapr-spring-messaging/pom.xml +++ b/dapr-spring/dapr-spring-messaging/pom.xml @@ -7,6 +7,7 @@ io.dapr.spring dapr-spring-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-spring-messaging diff --git a/dapr-spring/dapr-spring-workflows/pom.xml b/dapr-spring/dapr-spring-workflows/pom.xml index 80e12a468..4ab76673b 100644 --- a/dapr-spring/dapr-spring-workflows/pom.xml +++ b/dapr-spring/dapr-spring-workflows/pom.xml @@ -7,6 +7,7 @@ io.dapr.spring dapr-spring-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-spring-workflows diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index b62864875..4f34d3971 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml io.dapr.spring @@ -73,55 +74,15 @@ org.apache.maven.plugins maven-source-plugin - ${maven-sources-plugin.version} - - - attach-sources - - jar-no-fork - - - - org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - - - attach-javadocs - - jar - - - - org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - default-prepare-agent - - prepare-agent - - - - report - test - - report - - - target/jacoco-report/ - - check diff --git a/examples/pom.xml b/examples/pom.xml index daa770b19..bbb1b2c31 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-sdk-examples diff --git a/pom.xml b/pom.xml index 8669d784b..da550b8c3 100644 --- a/pom.xml +++ b/pom.xml @@ -18,11 +18,10 @@ 3.25.5 https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.5/dapr/proto 1.17.0-SNAPSHOT - 0.17.0-SNAPSHOT 1.7.1 - 3.1.1 - 1.8 - 2.7 + 3.8.1 + 3.1.0 + 3.1.3 3.3.1 3.13.0 3.3.1 @@ -36,8 +35,8 @@ 10.17.0 4.8.2.0 3.12.1 - 2.9 - 3.2.0 + 3.7.0 + 3.4.2 11 11 11 @@ -50,7 +49,7 @@ 2.16.1 true true - ../spotbugs-exclude.xml + ${maven.multiModuleProjectDirectory}/spotbugs-exclude.xml --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED 3.5.3 3.2.2 @@ -108,11 +107,9 @@ - - org.slf4j - slf4j-api - ${slf4j.version} - + + + io.grpc grpc-bom @@ -121,9 +118,18 @@ import - io.grpc - grpc-api - ${grpc.version} + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + com.fasterxml.jackson + jackson-bom + ${jackson.version} + pom + import org.junit @@ -132,6 +138,36 @@ import pom + + org.testcontainers + testcontainers-bom + ${testcontainers.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${protobuf.version} + pom + import + + + io.opentelemetry + opentelemetry-bom + ${opentelemetry.version} + pom + import + + + + + + + org.slf4j + slf4j-api + ${slf4j.version} + org.mockito mockito-core @@ -143,18 +179,6 @@ ${reactor.version} test - - io.grpc - grpc-testing - ${grpc.version} - test - - - io.grpc - grpc-inprocess - ${grpc.version} - test - org.jetbrains.kotlin kotlin-stdlib @@ -165,91 +189,10 @@ snakeyaml ${snakeyaml.version} - - org.testcontainers - testcontainers - ${testcontainers.version} - io.dapr dapr-sdk ${dapr.sdk.version} - compile - - - org.junit.jupiter - junit-jupiter - ${junit-bom.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit-bom.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit-bom.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit-bom.version} - - - org.testcontainers - junit-jupiter - ${testcontainers.version} - - - org.testcontainers - kafka - ${testcontainers.version} - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - io.opentelemetry - opentelemetry-bom - ${opentelemetry.version} - pom - import - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import - - - com.google.protobuf - protobuf-bom - ${protobuf.version} - pom - import - - - org.testcontainers - postgresql - ${testcontainers.version} - - - org.testcontainers - rabbitmq - ${testcontainers.version} io.rest-assured @@ -266,58 +209,11 @@ dapr-spring-boot-starter-test ${dapr.sdk.version} - - org.springframework.boot - spring-boot-starter-web - ${springboot.version} - - - org.springframework.boot - spring-boot-starter-actuator - ${springboot.version} - - - org.springframework.boot - spring-boot-starter-test - ${springboot.version} - - - org.springframework.boot - spring-boot-autoconfigure - ${springboot.version} - - - org.springframework.data - spring-data-keyvalue - ${springboot.version} - - - org.springframework.data - spring-data-commons - ${springboot.version} - - - org.springframework.boot - spring-boot-testcontainers - ${springboot.version} - io.dapr testcontainers-dapr ${dapr.sdk.version} - - org.testcontainers - toxiproxy - ${testcontainers.version} - test - - - org.testcontainers - mysql - ${testcontainers.version} - test - jakarta.annotation jakarta.annotation-api @@ -338,81 +234,11 @@ commons-cli ${commons-cli.version} - - io.grpc - grpc-protobuf - ${grpc.version} - - - io.grpc - grpc-stub - ${grpc.version} - - - io.grpc - grpc-netty - ${grpc.version} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.protobuf - protobuf-java-util - ${protobuf.version} - commons-io commons-io ${commons-io.version} - - io.opentelemetry - opentelemetry-sdk - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-api - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-context - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-sdk-common - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-sdk-trace - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-sdk-metrics - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-exporter-common - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-exporter-logging - ${opentelemetry.version} - - - io.opentelemetry - opentelemetry-exporter-zipkin - ${opentelemetry.version} - io.zipkin.reporter2 @@ -474,41 +300,11 @@ 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} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - com.fasterxml.jackson.datatype - 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 @@ -557,6 +353,14 @@ org.apache.maven.plugins maven-source-plugin ${maven-sources-plugin.version} + + + attach-sources + + jar-no-fork + + + org.apache.maven.plugins @@ -653,6 +457,17 @@ org.apache.maven.plugins maven-javadoc-plugin ${maven-javadoc-plugin.version} + + true + + + + attach-javadocs + + jar + + + org.xolstice.maven.plugins diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml index de6ec38f3..9adba4f25 100644 --- a/sdk-actors/pom.xml +++ b/sdk-actors/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-sdk-actors @@ -66,76 +67,14 @@ org.apache.maven.plugins maven-source-plugin - ${maven-sources-plugin.version} - - - attach-sources - - jar-no-fork - - - - org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - - - attach-javadocs - - jar - - - org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - default-prepare-agent - - prepare-agent - - - - report - test - - report - - - target/jacoco-report/ - - - - check - - check - - - - - BUNDLE - - - LINE - COVEREDRATIO - ${jacoco-maven-plugin.coverage-ratio} - - - - - - - - diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index 8c81fc572..b64287d81 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-sdk-autogen diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml index 7aabe3a51..a3db059f9 100644 --- a/sdk-springboot/pom.xml +++ b/sdk-springboot/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-sdk-springboot @@ -69,55 +70,15 @@ org.apache.maven.plugins maven-source-plugin - ${maven-sources-plugin.version} - - - attach-sources - - jar-no-fork - - - - org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - - - attach-javadocs - - jar - - - - org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - default-prepare-agent - - prepare-agent - - - - report - test - - report - - - target/jacoco-report/ - - check diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 4fc670f0f..29d051135 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-sdk-tests diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml index 696a3ec0d..1773d7fa0 100644 --- a/sdk-workflows/pom.xml +++ b/sdk-workflows/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-sdk-workflows @@ -77,76 +78,14 @@ org.apache.maven.plugins maven-source-plugin - ${maven-sources-plugin.version} - - - attach-sources - - jar-no-fork - - - - org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - - - attach-javadocs - - jar - - - org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - default-prepare-agent - - prepare-agent - - - - report - test - - report - - - target/jacoco-report/ - - - - check - - check - - - - - BUNDLE - - - LINE - COVEREDRATIO - ${jacoco-maven-plugin.coverage-ratio} - - - - - - - - diff --git a/sdk/pom.xml b/sdk/pom.xml index 5106b287f..501160412 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -8,6 +8,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml dapr-sdk @@ -155,53 +156,15 @@ org.apache.maven.plugins maven-source-plugin - ${maven-sources-plugin.version} - - - attach-sources - - jar-no-fork - - - org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - - - attach-javadocs - - jar - - - org.jacoco jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - default-prepare-agent - - prepare-agent - - - - report - test - - report - - - target/jacoco-report/ - - check @@ -225,7 +188,6 @@ - diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index d39a50cf5..78cb37506 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -6,6 +6,7 @@ io.dapr spring-boot-examples 1.17.0-SNAPSHOT + ../pom.xml consumer-app diff --git a/spring-boot-examples/pom.xml b/spring-boot-examples/pom.xml index 928edb1df..c7efeecf5 100644 --- a/spring-boot-examples/pom.xml +++ b/spring-boot-examples/pom.xml @@ -7,6 +7,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml spring-boot-examples diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index 467d48c2d..ba6dbb6b4 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -7,6 +7,7 @@ io.dapr spring-boot-examples 1.17.0-SNAPSHOT + ../pom.xml producer-app diff --git a/spring-boot-examples/workflows/multi-app/orchestrator/pom.xml b/spring-boot-examples/workflows/multi-app/orchestrator/pom.xml index c4f8a515f..91aa23c56 100644 --- a/spring-boot-examples/workflows/multi-app/orchestrator/pom.xml +++ b/spring-boot-examples/workflows/multi-app/orchestrator/pom.xml @@ -7,6 +7,7 @@ io.dapr multi-app 1.17.0-SNAPSHOT + ../pom.xml orchestrator diff --git a/spring-boot-examples/workflows/multi-app/pom.xml b/spring-boot-examples/workflows/multi-app/pom.xml index f6798d743..9c9d8a852 100644 --- a/spring-boot-examples/workflows/multi-app/pom.xml +++ b/spring-boot-examples/workflows/multi-app/pom.xml @@ -7,6 +7,7 @@ io.dapr workflows 1.17.0-SNAPSHOT + ../../pom.xml multi-app diff --git a/spring-boot-examples/workflows/multi-app/worker-one/pom.xml b/spring-boot-examples/workflows/multi-app/worker-one/pom.xml index e2447be6a..ac1f060a7 100644 --- a/spring-boot-examples/workflows/multi-app/worker-one/pom.xml +++ b/spring-boot-examples/workflows/multi-app/worker-one/pom.xml @@ -7,6 +7,7 @@ io.dapr multi-app 1.17.0-SNAPSHOT + ../pom.xml worker-one diff --git a/spring-boot-examples/workflows/multi-app/worker-two/pom.xml b/spring-boot-examples/workflows/multi-app/worker-two/pom.xml index 9584fabf3..e44c0f197 100644 --- a/spring-boot-examples/workflows/multi-app/worker-two/pom.xml +++ b/spring-boot-examples/workflows/multi-app/worker-two/pom.xml @@ -7,6 +7,7 @@ io.dapr multi-app 1.17.0-SNAPSHOT + ../pom.xml worker-two diff --git a/spring-boot-examples/workflows/patterns/pom.xml b/spring-boot-examples/workflows/patterns/pom.xml index a737ec5dc..5aa157ed3 100644 --- a/spring-boot-examples/workflows/patterns/pom.xml +++ b/spring-boot-examples/workflows/patterns/pom.xml @@ -7,6 +7,7 @@ io.dapr workflows 1.17.0-SNAPSHOT + ../pom.xml patterns diff --git a/spring-boot-examples/workflows/pom.xml b/spring-boot-examples/workflows/pom.xml index 1c711fbc1..d6f8a8eae 100644 --- a/spring-boot-examples/workflows/pom.xml +++ b/spring-boot-examples/workflows/pom.xml @@ -7,6 +7,7 @@ io.dapr spring-boot-examples 1.17.0-SNAPSHOT + ../pom.xml workflows diff --git a/testcontainers-dapr/pom.xml b/testcontainers-dapr/pom.xml index 0e6026ff1..786ec56a9 100644 --- a/testcontainers-dapr/pom.xml +++ b/testcontainers-dapr/pom.xml @@ -6,6 +6,7 @@ io.dapr dapr-sdk-parent 1.17.0-SNAPSHOT + ../pom.xml testcontainers-dapr @@ -43,31 +44,10 @@ org.apache.maven.plugins maven-source-plugin - ${maven-sources-plugin.version} - - - attach-sources - - jar-no-fork - - - org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - true - - - - attach-javadocs - - jar - - - org.jacoco From 446733b0b79fd5e0eb7e222f248a750db3212d0f Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Tue, 25 Nov 2025 02:35:48 -0800 Subject: [PATCH 3/7] Fix incorrect relative path Signed-off-by: Artur Ciocanu --- spring-boot-examples/workflows/multi-app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-examples/workflows/multi-app/pom.xml b/spring-boot-examples/workflows/multi-app/pom.xml index 9c9d8a852..2f9570cf2 100644 --- a/spring-boot-examples/workflows/multi-app/pom.xml +++ b/spring-boot-examples/workflows/multi-app/pom.xml @@ -7,7 +7,7 @@ io.dapr workflows 1.17.0-SNAPSHOT - ../../pom.xml + ../pom.xml multi-app From b5dd1996a0e7989cfa70177ad89a7d1c837b166f Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Tue, 25 Nov 2025 12:20:28 -0800 Subject: [PATCH 4/7] Revert to previous version of Testcontainers Signed-off-by: Artur Ciocanu --- pom.xml | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da550b8c3..19107de8f 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 3.2.2 5.11.4 2.0 - 1.21.3 + 1.20.5 3.4.9 6.2.7 @@ -163,6 +163,44 @@ + + + org.testcontainers + testcontainers + ${testcontainers.version} + + + org.testcontainers + junit-jupiter + ${testcontainers.version} + + + org.testcontainers + kafka + ${testcontainers.version} + + + org.testcontainers + postgresql + ${testcontainers.version} + + + org.testcontainers + rabbitmq + ${testcontainers.version} + + + org.testcontainers + toxiproxy + ${testcontainers.version} + test + + + org.testcontainers + mysql + ${testcontainers.version} + test + org.slf4j slf4j-api From 208c68fc3d02f33ed4df338ea7803def9e979b9e Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Tue, 25 Nov 2025 12:33:10 -0800 Subject: [PATCH 5/7] Trying to fix Docker iptables issue Signed-off-by: Artur Ciocanu --- .github/workflows/build.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96d7563b2..64f2b6dfd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,12 +74,9 @@ jobs: DAPR_REF: TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64 steps: - - name: Install Stable Docker - id: setup_docker - uses: docker/setup-docker-action@v4 - - name: Check Docker version - run: docker version - uses: actions/checkout@v5 + - name: Check Docker version + run: docker version - name: Set up OpenJDK ${{ env.JDK_VER }} uses: actions/setup-java@v5 with: @@ -153,8 +150,6 @@ jobs: - name: Integration tests using spring boot version ${{ matrix.spring-boot-version }} id: integration_tests run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests dependency:copy-dependencies verify - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Upload failsafe test report for sdk-tests on failure if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }} uses: actions/upload-artifact@v5 From 7b2ddf99a1feb86f37abc41fec075047c65efa5a Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Tue, 25 Nov 2025 13:00:53 -0800 Subject: [PATCH 6/7] Cleanup docker host env and ensure proper deps for JUnit Signed-off-by: Artur Ciocanu --- .github/workflows/validate.yml | 41 ---------------------------------- pom.xml | 21 +++++++++++++++++ 2 files changed, 21 insertions(+), 41 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a79ecce96..727f783df 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -49,9 +49,6 @@ jobs: with: distribution: 'temurin' java-version: ${{ env.JDK_VER }} - - name: Install Stable Docker - id: setup_docker - uses: docker/setup-docker-action@v4 - name: Check Docker version run: docker version - name: Set up Dapr CLI @@ -116,114 +113,76 @@ jobs: run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006 - name: Install jars run: ./mvnw clean install -DskipTests -q - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate workflows example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/workflows/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate Spring Boot examples working-directory: ./spring-boot-examples run: | mm.py README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate Spring Boot Workflow Patterns examples working-directory: ./spring-boot-examples/workflows/patterns run: | mm.py README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate Jobs example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/jobs/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate conversation ai example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/conversation/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate invoke http example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/invoke/http/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate invoke grpc example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/invoke/grpc/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate tracing example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/tracing/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate expection handling example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/exception/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate state example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/state/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate pubsub example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/pubsub/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate bindings HTTP example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/bindings/http/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate secrets example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/secrets/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate unit testing example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/unittesting/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate Configuration API example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/configuration/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate actors example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/actors/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate query state HTTP example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/querystate/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} - name: Validate streaming subscription example working-directory: ./examples run: | mm.py ./src/main/java/io/dapr/examples/pubsub/stream/README.md - env: - DOCKER_HOST: ${{steps.setup_docker.outputs.sock}} diff --git a/pom.xml b/pom.xml index 19107de8f..fb494bf79 100644 --- a/pom.xml +++ b/pom.xml @@ -343,6 +343,27 @@ junit-platform-console-standalone ${junit-platform-console.version} + + + org.junit.jupiter + junit-jupiter + ${junit-bom.version} + + + org.junit.jupiter + junit-jupiter-api + ${junit-bom.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit-bom.version} + + + org.junit.jupiter + junit-jupiter-params + ${junit-bom.version} + io.projectreactor reactor-core From 78f2f0da0a69132e4618b80349a145dd102363d8 Mon Sep 17 00:00:00 2001 From: Artur Ciocanu Date: Wed, 26 Nov 2025 11:02:35 -0800 Subject: [PATCH 7/7] Revert Testcontainers version Signed-off-by: Artur Ciocanu --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb494bf79..b145738aa 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 3.2.2 5.11.4 2.0 - 1.20.5 + 1.21.3 3.4.9 6.2.7