diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index f5fffffed8..240ab9fe07 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -18,19 +18,20 @@ io.dapr.spring dapr-spring-data - ${project.parent.version} true + + io.dapr + dapr-sdk-actors + io.dapr.spring dapr-spring-messaging - ${project.parent.version} true io.dapr.spring dapr-spring-workflows - ${project.parent.version} true @@ -71,9 +72,20 @@ io.dapr testcontainers-dapr - ${dapr.sdk.alpha.version} test + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework.boot + spring-boot-starter-test + diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml index 141c28cedb..2bca355e88 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml @@ -23,12 +23,10 @@ io.dapr.spring dapr-spring-boot-tests - ${project.parent.version} io.dapr testcontainers-dapr - ${project.parent.version} org.springframework.boot diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml index a57f708daa..ff916ac25e 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml @@ -23,27 +23,22 @@ io.dapr dapr-sdk-springboot - ${dapr.sdk.version} io.dapr.spring dapr-spring-boot-autoconfigure - ${project.parent.version} io.dapr.spring dapr-spring-data - ${project.parent.version} io.dapr.spring dapr-spring-messaging - ${project.parent.version} io.dapr.spring dapr-spring-workflows - ${project.parent.version} diff --git a/dapr-spring/dapr-spring-boot-tests/pom.xml b/dapr-spring/dapr-spring-boot-tests/pom.xml index b9210d0584..e0e3425f68 100644 --- a/dapr-spring/dapr-spring-boot-tests/pom.xml +++ b/dapr-spring/dapr-spring-boot-tests/pom.xml @@ -22,7 +22,6 @@ io.dapr.spring dapr-spring-boot-autoconfigure - ${project.parent.version} org.testcontainers @@ -38,7 +37,6 @@ io.dapr testcontainers-dapr - ${dapr.sdk.alpha.version} diff --git a/dapr-spring/dapr-spring-data/pom.xml b/dapr-spring/dapr-spring-data/pom.xml index bd6efe151b..bf7b8b3be1 100644 --- a/dapr-spring/dapr-spring-data/pom.xml +++ b/dapr-spring/dapr-spring-data/pom.xml @@ -19,6 +19,10 @@ org.springframework.data spring-data-keyvalue + + io.dapr + dapr-sdk + diff --git a/dapr-spring/dapr-spring-messaging/pom.xml b/dapr-spring/dapr-spring-messaging/pom.xml index d5d50ef4ed..6ab4ce2301 100644 --- a/dapr-spring/dapr-spring-messaging/pom.xml +++ b/dapr-spring/dapr-spring-messaging/pom.xml @@ -14,6 +14,17 @@ Dapr Spring Messaging jar + + + org.springframework + spring-context + + + io.dapr + dapr-sdk + + + diff --git a/dapr-spring/dapr-spring-workflows/pom.xml b/dapr-spring/dapr-spring-workflows/pom.xml index 2182b60908..bac4ab7d2c 100644 --- a/dapr-spring/dapr-spring-workflows/pom.xml +++ b/dapr-spring/dapr-spring-workflows/pom.xml @@ -15,10 +15,17 @@ jar + + org.springframework + spring-beans + + + org.springframework + spring-context + io.dapr dapr-sdk-workflows - ${project.version} diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 740f7cdd16..f332fb217d 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -28,12 +28,14 @@ - 3.2.6 11 11 11 1.19.8 - 5.10.2 + 5.11.2 + 0.16.0-SNAPSHOT + 3.2.6 + 6.1.8 1.4.14 @@ -44,32 +46,121 @@ 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.alpha.version} + + + io.dapr.spring + dapr-spring-data + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-messaging + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-workflows + ${dapr.spring.version} + + + io.dapr.spring + dapr-spring-boot-autoconfigure + ${dapr.spring.version} + + + io.dapr + 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 ch.qos.logback @@ -79,46 +170,6 @@ - - - - io.dapr - dapr-sdk - ${dapr.sdk.version} - - - io.dapr - dapr-sdk-actors - ${dapr.sdk.version} - - - - - org.springframework - spring-web - true - - - org.springframework - spring-context - true - - - org.springframework.boot - spring-boot-configuration-processor - ${springboot.version} - true - - - - - org.springframework.boot - spring-boot-starter-test - ${springboot.version} - test - - - diff --git a/pom.xml b/pom.xml index c0c67a89d4..a5d3205695 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.dapr @@ -129,11 +129,11 @@ ${grpc.version} test - - org.jetbrains.kotlin - kotlin-stdlib - 2.1.0 - + + org.jetbrains.kotlin + kotlin-stdlib + 2.1.0 + org.yaml snakeyaml @@ -241,6 +241,11 @@ spring-boot-testcontainers ${springboot.version} + + io.dapr + testcontainers-dapr + ${dapr.sdk.alpha.version} + org.testcontainers toxiproxy diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index ad64eb49ab..8bb5e715d7 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -55,6 +55,15 @@ rest-assured test + + org.junit.jupiter + junit-jupiter-api + test + + + org.springframework.boot + spring-boot-starter-test +