From 5535e58f5442b241e215a059c1bacd0c4bdd78d2 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Fri, 14 Mar 2025 14:10:10 -0700 Subject: [PATCH 01/20] Clean up pom Signed-off-by: sirivarma --- pom.xml | 127 +++++++++++++++++++++- spring-boot-examples/consumer-app/pom.xml | 29 +---- spring-boot-examples/pom.xml | 1 - spring-boot-examples/producer-app/pom.xml | 20 +--- testcontainers-dapr/pom.xml | 51 --------- 5 files changed, 138 insertions(+), 90 deletions(-) diff --git a/pom.xml b/pom.xml index 5ab3051c25..75494193ad 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,6 @@ org.mockito mockito-core 3.11.2 - test io.projectreactor @@ -120,12 +119,95 @@ kotlin-stdlib 2.1.0 + + org.yaml + snakeyaml + ${snakeyaml.version} + + + org.testcontainers + testcontainers + ${testcontainers.version} + + + io.dapr + dapr-sdk + ${dapr.sdk.version} + compile + + + org.junit.jupiter + junit-jupiter + 5.11.4 + + + org.testcontainers + junit-jupiter + 1.20.5 + + + org.testcontainers + kafka + 1.20.0 + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + + + org.testcontainers + postgresql + 1.20.0 + + + org.testcontainers + rabbitmq + 1.20.0 + + + io.rest-assured + rest-assured + 5.5.1 + test + + + io.dapr.spring + dapr-spring-boot-starter + ${dapr.sdk.alpha.version} + + + io.dapr.spring + dapr-spring-boot-starter-test + ${dapr.sdk.alpha.version} + + + org.springframework.boot + spring-boot-starter-web + ${springboot.version} + + + org.springframework.boot + spring-boot-starter-actuator + ${springboot.version} + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + org.apache.maven.plugins maven-compiler-plugin @@ -174,6 +256,49 @@ true + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + default-prepare-agent + + prepare-agent + + + + report + test + + report + + + target/jacoco-report/ + + + + check + + check + + + + + BUNDLE + + + LINE + COVEREDRATIO + 80% + + + + + + + + diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index 9255bb13a0..0970c26cd3 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -12,20 +12,13 @@ consumer-app Spring Boot, Testcontainers and Dapr Integration Examples :: Consumer App - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - + + org.springframework.boot + spring-boot-dependencies + pom + import + org.springframework.boot spring-boot-starter-web @@ -37,16 +30,12 @@ io.dapr.spring dapr-spring-boot-starter - ${dapr.sdk.alpha.version} - io.dapr.spring dapr-spring-boot-starter-test - ${dapr.sdk.alpha.version} test - org.testcontainers junit-jupiter @@ -55,22 +44,18 @@ org.testcontainers postgresql - 1.20.0 test org.testcontainers rabbitmq - 1.20.0 test org.testcontainers kafka - 1.20.0 test - io.rest-assured rest-assured @@ -83,12 +68,10 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} org.apache.maven.plugins maven-site-plugin - 3.12.1 true diff --git a/spring-boot-examples/pom.xml b/spring-boot-examples/pom.xml index 4ed1fbe494..4eb772d796 100644 --- a/spring-boot-examples/pom.xml +++ b/spring-boot-examples/pom.xml @@ -27,7 +27,6 @@ org.apache.maven.plugins maven-site-plugin - 3.12.1 true diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index dd7a4fee5b..5c7c944f0d 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -13,25 +13,17 @@ producer-app Spring Boot, Testcontainers and Dapr Integration Examples :: Producer App - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - + + org.springframework.boot + spring-boot-dependencies + pom + import + org.springframework.boot spring-boot-starter-actuator - org.springframework.boot spring-boot-starter-web diff --git a/testcontainers-dapr/pom.xml b/testcontainers-dapr/pom.xml index 13110b70b3..2f4fbb7e17 100644 --- a/testcontainers-dapr/pom.xml +++ b/testcontainers-dapr/pom.xml @@ -28,19 +28,11 @@ org.yaml snakeyaml - ${snakeyaml.version} org.testcontainers testcontainers - ${testcontainers.version} - - io.dapr - dapr-sdk - ${project.parent.version} - compile - @@ -52,7 +44,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -62,11 +53,9 @@ - org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 attach-javadocs @@ -79,46 +68,6 @@ org.jacoco jacoco-maven-plugin - 0.8.11 - - - default-prepare-agent - - prepare-agent - - - - report - test - - report - - - target/jacoco-report/ - - - - check - - check - - - - - BUNDLE - - - LINE - COVEREDRATIO - 80% - - - - - - - - From cd2b56065ef8b2e2f35c2d998ad845e3ddbe7563 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Fri, 14 Mar 2025 14:19:05 -0700 Subject: [PATCH 02/20] downgrade dependency Signed-off-by: sirivarma --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 75494193ad..7b460a1c4c 100644 --- a/pom.xml +++ b/pom.xml @@ -138,12 +138,12 @@ org.junit.jupiter junit-jupiter - 5.11.4 + 5.8.2 org.testcontainers junit-jupiter - 1.20.5 + 1.19.8 org.testcontainers From 1a1198fffa53ef142143c4dd137e8ba41740634c Mon Sep 17 00:00:00 2001 From: sirivarma Date: Fri, 14 Mar 2025 15:11:36 -0700 Subject: [PATCH 03/20] Fix Signed-off-by: sirivarma --- spring-boot-examples/producer-app/pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index 5c7c944f0d..a0980232f5 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -31,12 +31,10 @@ io.dapr.spring dapr-spring-boot-starter - ${dapr.sdk.alpha.version} io.dapr.spring dapr-spring-boot-starter-test - ${dapr.sdk.alpha.version} test @@ -47,13 +45,11 @@ org.testcontainers postgresql - 1.20.0 test org.testcontainers rabbitmq - 1.20.0 test @@ -68,12 +64,10 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} org.apache.maven.plugins maven-site-plugin - 3.12.1 true From 1fce38bced45e6ad37d94270035c94478375f45c Mon Sep 17 00:00:00 2001 From: sirivarma Date: Fri, 14 Mar 2025 15:23:14 -0700 Subject: [PATCH 04/20] Fix thigns Signed-off-by: sirivarma --- pom.xml | 5 +++++ spring-boot-examples/producer-app/pom.xml | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 7b460a1c4c..17a6762b05 100644 --- a/pom.xml +++ b/pom.xml @@ -192,6 +192,11 @@ spring-boot-starter-actuator ${springboot.version} + + org.springframework.boot + spring-boot-starter-test + ${springboot.version} + diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index a0980232f5..01cb55da91 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -28,6 +28,10 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-test + io.dapr.spring dapr-spring-boot-starter From d2ecf1820442bdd0f09e696254c41de994fc42bf Mon Sep 17 00:00:00 2001 From: sirivarma Date: Fri, 14 Mar 2025 15:56:51 -0700 Subject: [PATCH 05/20] Fix class not found Signed-off-by: sirivarma --- dapr-spring/pom.xml | 2 +- pom.xml | 19 +++++++++++++++++-- spring-boot-examples/consumer-app/pom.xml | 1 - spring-boot-examples/producer-app/pom.xml | 5 ----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 04f59acaaa..2aef2135a5 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -28,7 +28,7 @@ - 3.2.6 + 3.4.3 11 11 11 diff --git a/pom.xml b/pom.xml index 17a6762b05..c827b18804 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED 3.2.2 3.2.2 - 5.8.2 + 5.11.4 2.0 1.20.0 3.4.3 @@ -138,7 +138,22 @@ org.junit.jupiter junit-jupiter - 5.8.2 + 5.11.4 + + + org.junit.jupiter + junit-jupiter-api + 5.11.4 + + + org.junit.jupiter + junit-jupiter-engine + 5.11.4 + + + org.junit.jupiter + junit-jupiter-params + 5.11.4 org.testcontainers diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index 0970c26cd3..ede94bdcbe 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -17,7 +17,6 @@ org.springframework.boot spring-boot-dependencies pom - import org.springframework.boot diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index 01cb55da91..8b6d64a8ef 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -41,11 +41,6 @@ dapr-spring-boot-starter-test test - - org.testcontainers - junit-jupiter - test - org.testcontainers postgresql From c49af42aa943e99e9d82fa5bf28f6ace2a2b06e9 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Fri, 14 Mar 2025 16:00:02 -0700 Subject: [PATCH 06/20] Remove import Signed-off-by: sirivarma --- spring-boot-examples/producer-app/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index 8b6d64a8ef..cb8dc4cab2 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -18,7 +18,6 @@ org.springframework.boot spring-boot-dependencies pom - import org.springframework.boot From 7134837e37edaaf0a2c5403c7dd0e6499538ea60 Mon Sep 17 00:00:00 2001 From: Siri Varma Vegiraju Date: Sun, 16 Mar 2025 22:18:47 -0700 Subject: [PATCH 07/20] Address comments Signed-off-by: Siri Varma Vegiraju --- pom.xml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index c827b18804..820888bbcf 100644 --- a/pom.xml +++ b/pom.xml @@ -26,6 +26,9 @@ 2.7 3.3.1 3.13.0 + 3.2.1 + 0.8.11 + 80% 11 11 11 @@ -138,32 +141,32 @@ org.junit.jupiter junit-jupiter - 5.11.4 + ${junit-bom.version} org.junit.jupiter junit-jupiter-api - 5.11.4 + ${junit-bom.version} org.junit.jupiter junit-jupiter-engine - 5.11.4 + ${junit-bom.version} org.junit.jupiter junit-jupiter-params - 5.11.4 + ${junit-bom.version} org.testcontainers junit-jupiter - 1.19.8 + ${testcontainers.version} org.testcontainers kafka - 1.20.0 + ${testcontainers.version} org.springframework.boot @@ -174,18 +177,17 @@ org.testcontainers postgresql - 1.20.0 + ${testcontainers.version} org.testcontainers rabbitmq - 1.20.0 + ${testcontainers.version} io.rest-assured rest-assured 5.5.1 - test io.dapr.spring @@ -226,7 +228,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + ${maven-sources-plugin.version} org.apache.maven.plugins @@ -279,7 +281,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + ${jacoco-maven-plugin.version} default-prepare-agent @@ -310,7 +312,7 @@ LINE COVEREDRATIO - 80% + ${jacoco-maven-plugin.coverage-ratio} From 250d17e4bf9ff8d06552509c423947835e30c292 Mon Sep 17 00:00:00 2001 From: Siri Varma Vegiraju Date: Mon, 17 Mar 2025 11:03:34 -0700 Subject: [PATCH 08/20] cleanup Signed-off-by: Siri Varma Vegiraju --- .../dapr-spring-boot-autoconfigure/pom.xml | 20 ++++++++++++++++ dapr-spring/pom.xml | 24 ++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 3eca526528..78dfbca572 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -57,6 +57,26 @@ testcontainers test + + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + + + org.junit.jupiter + junit-jupiter-engine + test + org.testcontainers junit-jupiter diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 2aef2135a5..0a15602bf3 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -28,7 +28,7 @@ - 3.4.3 + 3.2.6 11 11 11 @@ -43,6 +43,26 @@ pom import + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + + + org.junit.jupiter + junit-jupiter-params + 5.8.2 + + + org.junit.jupiter + junit-jupiter-engine + 5.8.2 + + + org.junit.jupiter + junit-jupiter + 5.8.2 + @@ -73,6 +93,7 @@ org.springframework.boot spring-boot-configuration-processor + ${springboot.version} true @@ -80,6 +101,7 @@ org.springframework.boot spring-boot-starter-test + ${springboot.version} test From 1921247401d87efa79024f534466af30a59717ef Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 17 Mar 2025 14:07:37 -0700 Subject: [PATCH 09/20] Fix deps Signed-off-by: siri-varma --- dapr-spring/pom.xml | 8 +++--- pom.xml | 15 +++++++++++ sdk-tests/components/secret.json | 1 - sdk-tests/pom.xml | 44 ++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 5 deletions(-) delete mode 100644 sdk-tests/components/secret.json diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 0a15602bf3..fa8be39929 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -46,22 +46,22 @@ org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-params - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter - 5.8.2 + 5.10.2 diff --git a/pom.xml b/pom.xml index 820888bbcf..33e310099b 100644 --- a/pom.xml +++ b/pom.xml @@ -214,6 +214,21 @@ spring-boot-starter-test ${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} + diff --git a/sdk-tests/components/secret.json b/sdk-tests/components/secret.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/sdk-tests/components/secret.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 57bf69477a..f9debd7ded 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -33,6 +33,7 @@ 1.5.16 3.9.1 1.20.0 + 0% @@ -234,6 +235,49 @@ + + 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} + + + + + + + + com.github.os72 protoc-jar-maven-plugin From 1afd27aa23f6cf6981835d622513025a93f91a65 Mon Sep 17 00:00:00 2001 From: Siri Varma Vegiraju Date: Mon, 17 Mar 2025 11:03:34 -0700 Subject: [PATCH 10/20] cleanup Signed-off-by: Siri Varma Vegiraju Signed-off-by: siri-varma --- .../dapr-spring-boot-autoconfigure/pom.xml | 20 ++++++++++++++++ dapr-spring/pom.xml | 24 ++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 3eca526528..78dfbca572 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -57,6 +57,26 @@ testcontainers test + + org.junit.jupiter + junit-jupiter + test + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-params + test + + + org.junit.jupiter + junit-jupiter-engine + test + org.testcontainers junit-jupiter diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 2aef2135a5..0a15602bf3 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -28,7 +28,7 @@ - 3.4.3 + 3.2.6 11 11 11 @@ -43,6 +43,26 @@ pom import + + org.junit.jupiter + junit-jupiter-api + 5.8.2 + + + org.junit.jupiter + junit-jupiter-params + 5.8.2 + + + org.junit.jupiter + junit-jupiter-engine + 5.8.2 + + + org.junit.jupiter + junit-jupiter + 5.8.2 + @@ -73,6 +93,7 @@ org.springframework.boot spring-boot-configuration-processor + ${springboot.version} true @@ -80,6 +101,7 @@ org.springframework.boot spring-boot-starter-test + ${springboot.version} test From 56872d6dae1ab67140b3893ca9d72fdbaa3eecfb Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 17 Mar 2025 14:07:37 -0700 Subject: [PATCH 11/20] Fix deps Signed-off-by: siri-varma --- dapr-spring/pom.xml | 8 +++--- pom.xml | 15 +++++++++++ sdk-tests/components/secret.json | 1 - sdk-tests/pom.xml | 44 ++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 5 deletions(-) delete mode 100644 sdk-tests/components/secret.json diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 0a15602bf3..fa8be39929 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -46,22 +46,22 @@ org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-params - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.10.2 org.junit.jupiter junit-jupiter - 5.8.2 + 5.10.2 diff --git a/pom.xml b/pom.xml index 820888bbcf..33e310099b 100644 --- a/pom.xml +++ b/pom.xml @@ -214,6 +214,21 @@ spring-boot-starter-test ${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} + diff --git a/sdk-tests/components/secret.json b/sdk-tests/components/secret.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/sdk-tests/components/secret.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 57bf69477a..f9debd7ded 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -33,6 +33,7 @@ 1.5.16 3.9.1 1.20.0 + 0% @@ -234,6 +235,49 @@ + + 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} + + + + + + + + com.github.os72 protoc-jar-maven-plugin From 0c737587362e31d3ee2b17414b62f6ab578733c6 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 17 Mar 2025 14:09:54 -0700 Subject: [PATCH 12/20] Fix things Signed-off-by: siri-varma --- .../dapr-spring-boot-autoconfigure/pom.xml | 20 ------------------- sdk-tests/components/secret.json | 1 + 2 files changed, 1 insertion(+), 20 deletions(-) create mode 100644 sdk-tests/components/secret.json diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 78dfbca572..3eca526528 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -57,26 +57,6 @@ testcontainers test - - org.junit.jupiter - junit-jupiter - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-params - test - - - org.junit.jupiter - junit-jupiter-engine - test - org.testcontainers junit-jupiter diff --git a/sdk-tests/components/secret.json b/sdk-tests/components/secret.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/sdk-tests/components/secret.json @@ -0,0 +1 @@ +{} \ No newline at end of file From 0126b3523f49291842525a3fdb2ebfcf9d8d283e Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 17 Mar 2025 14:17:47 -0700 Subject: [PATCH 13/20] Fix finals Signed-off-by: siri-varma --- .../dapr-spring-boot-autoconfigure/pom.xml | 20 ------------------- sdk-tests/components/secret.json | 1 + 2 files changed, 1 insertion(+), 20 deletions(-) create mode 100644 sdk-tests/components/secret.json diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 78dfbca572..3eca526528 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -57,26 +57,6 @@ testcontainers test - - org.junit.jupiter - junit-jupiter - test - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-params - test - - - org.junit.jupiter - junit-jupiter-engine - test - org.testcontainers junit-jupiter diff --git a/sdk-tests/components/secret.json b/sdk-tests/components/secret.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/sdk-tests/components/secret.json @@ -0,0 +1 @@ +{} \ No newline at end of file From dd1eb853a0ae0fc67b7f098ee6048f021dd58855 Mon Sep 17 00:00:00 2001 From: siri-varma Date: Mon, 17 Mar 2025 14:23:31 -0700 Subject: [PATCH 14/20] Fix finals Signed-off-by: siri-varma --- spring-boot-examples/consumer-app/pom.xml | 5 ----- spring-boot-examples/producer-app/pom.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index ede94bdcbe..b2e2d09406 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -13,11 +13,6 @@ Spring Boot, Testcontainers and Dapr Integration Examples :: Consumer App - - org.springframework.boot - spring-boot-dependencies - pom - org.springframework.boot spring-boot-starter-web diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index cb8dc4cab2..b9ab6fcbfa 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -14,11 +14,6 @@ Spring Boot, Testcontainers and Dapr Integration Examples :: Producer App - - org.springframework.boot - spring-boot-dependencies - pom - org.springframework.boot spring-boot-starter-actuator From 7e55624be69a14426c6b39ce3a5e4cd217dad176 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Mon, 17 Mar 2025 17:25:11 -0700 Subject: [PATCH 15/20] upgrade test containers to .5 Signed-off-by: sirivarma --- dapr-spring/pom.xml | 6 ++++++ pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index fa8be39929..e03f7fda92 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -32,6 +32,7 @@ 11 11 11 + 1.19.8 @@ -63,6 +64,11 @@ junit-jupiter 5.10.2 + + org.testcontainers + junit-jupiter + ${testcontainers.version} + diff --git a/pom.xml b/pom.xml index 33e310099b..729eb0a71b 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 3.2.2 5.11.4 2.0 - 1.20.0 + 1.20.5 3.4.3 1.7.0 From c8ce694cf6ab4932d2d6d0af0972818c3d8b14b2 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Mon, 17 Mar 2025 20:51:53 -0700 Subject: [PATCH 16/20] This is it Signed-off-by: sirivarma --- sdk-tests/pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index a0e12b7979..0e42552f3a 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -46,6 +46,16 @@ pom import + + org.junit.platform + junit-platform-commons + 1.11.4 + + + org.junit.platform + junit-platform-engine + 1.11.4 + @@ -236,6 +246,16 @@ jakarta.servlet-api compile + + org.junit.platform + junit-platform-commons + test + + + org.junit.platform + junit-platform-engine + test + From 48fc5f43e2b21446bc0e4e0fc7538cc96fcd8562 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Thu, 20 Mar 2025 10:44:44 -0700 Subject: [PATCH 17/20] Fix feedback Signed-off-by: sirivarma --- sdk-tests/pom.xml | 5 +++-- spring-boot-examples/pom.xml | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 0e42552f3a..ca1cb16bac 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -34,6 +34,7 @@ 3.9.1 1.20.0 0% + 1.11.4 @@ -49,12 +50,12 @@ org.junit.platform junit-platform-commons - 1.11.4 + ${junit-platform.version} org.junit.platform junit-platform-engine - 1.11.4 + ${junit-platform.version} diff --git a/spring-boot-examples/pom.xml b/spring-boot-examples/pom.xml index 4eb772d796..75a32364f7 100644 --- a/spring-boot-examples/pom.xml +++ b/spring-boot-examples/pom.xml @@ -15,6 +15,7 @@ true + 3.4.3 @@ -22,6 +23,18 @@ consumer-app + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + From 13095c0a689ded7ee3dc214e3131ff31b9df7015 Mon Sep 17 00:00:00 2001 From: sirivarma Date: Thu, 20 Mar 2025 18:17:54 -0700 Subject: [PATCH 18/20] Add comment Signed-off-by: sirivarma --- sdk-tests/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index ca1cb16bac..b3467f46f8 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -33,6 +33,9 @@ 1.5.16 3.9.1 1.20.0 + + 0% 1.11.4 From 9807ec7a99591ccb5dc3f1a3d5407543f0dd522e Mon Sep 17 00:00:00 2001 From: sirivarma Date: Thu, 20 Mar 2025 18:18:42 -0700 Subject: [PATCH 19/20] Add comment Signed-off-by: sirivarma --- sdk-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index b3467f46f8..c1ffacad0e 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -35,7 +35,7 @@ 1.20.0 + and code coverage typically doesn't apply to tests, the coverage is set to 0. --> 0% 1.11.4 From f34d4f78346a4469c1faad27f9d4d6ed625fee5c Mon Sep 17 00:00:00 2001 From: sirivarma Date: Sun, 23 Mar 2025 16:46:42 -0700 Subject: [PATCH 20/20] Change to properties Signed-off-by: sirivarma --- dapr-spring/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index e03f7fda92..fe4ebaa172 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -33,6 +33,7 @@ 11 11 1.19.8 + 5.10.2 @@ -47,22 +48,22 @@ org.junit.jupiter junit-jupiter-api - 5.10.2 + ${junit.version} org.junit.jupiter junit-jupiter-params - 5.10.2 + ${junit.version} org.junit.jupiter junit-jupiter-engine - 5.10.2 + ${junit.version} org.junit.jupiter junit-jupiter - 5.10.2 + ${junit.version} org.testcontainers