diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 203e98544e..fc602c3f22 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -13,7 +13,6 @@ io.dapr.spring dapr-spring-parent pom - 1.17.0-SNAPSHOT dapr-spring-parent SDK extension for Spring and Spring Boot @@ -31,35 +30,12 @@ 11 11 11 - 1.19.8 - 5.11.2 1.17.0-SNAPSHOT - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - - - 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 @@ -80,86 +56,11 @@ 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 - diff --git a/examples/pom.xml b/examples/pom.xml index 9aab1aee51..413d7c45ce 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,81 +21,65 @@ ${java.version} ${java.version} false - 1.41.0 - 3.4.0 commons-cli commons-cli - 1.9.0 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 json-path - 2.9.0 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 @@ -111,7 +94,6 @@ org.junit.platform junit-platform-console-standalone - 1.7.0 compile @@ -127,7 +109,7 @@ io.dapr dapr-sdk-workflows - ${dapr.sdk.version} + ${project.version} io.dapr @@ -137,17 +119,14 @@ com.evanlennick retry4j - 0.15.0 javax.annotation javax.annotation-api - 1.3.2 com.google.protobuf protobuf-java - ${protobuf.version} diff --git a/pom.xml b/pom.xml index 8c9caa57e1..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 @@ -62,8 +60,24 @@ 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 + 2.1.0 + 2.1.0 + 5.5.1 @@ -87,7 +101,7 @@ org.slf4j slf4j-api - 2.0.9 + ${slf4j.version} io.grpc @@ -111,12 +125,12 @@ org.mockito mockito-core - 3.11.2 + ${mockito.version} io.projectreactor reactor-test - 3.5.12 + ${reactor.version} test @@ -134,7 +148,7 @@ org.jetbrains.kotlin kotlin-stdlib - 2.1.0 + ${kotlin.version} org.yaml @@ -187,6 +201,7 @@ spring-boot-dependencies ${springboot.version} pom + import org.testcontainers @@ -201,7 +216,7 @@ io.rest-assured rest-assured - 5.5.1 + ${rest-assured.version} io.dapr.spring @@ -228,6 +243,11 @@ spring-boot-starter-test ${springboot.version} + + org.springframework.boot + spring-boot-autoconfigure + ${springboot.version} + org.springframework.data spring-data-keyvalue @@ -290,6 +310,21 @@ 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 @@ -371,6 +406,96 @@ 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} + + + 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 + ${reactor.version} + + + io.dapr + durabletask-client + ${durabletask-client.version} + + + com.redis + testcontainers-redis + ${testcontainers-redis.version} + + + io.github.microcks + microcks-testcontainers + ${microcks.version} + + + org.assertj + assertj-core + ${assertj.version} + diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml index 494dc7e626..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 @@ -39,25 +38,21 @@ commons-cli commons-cli - 1.9.0 test org.springframework.boot spring-boot-starter-web - ${springboot.version} test io.grpc grpc-testing - ${grpc.version} test commons-validator commons-validator - 1.7 test diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index 0204568769..cd37138cc8 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 @@ -21,37 +20,29 @@ ${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 io.grpc - grpc-netty-shaded - ${grpc.version} - runtime + grpc-netty 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 3792008268..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 @@ -30,7 +29,6 @@ org.mockito mockito-inline - 4.2.0 test @@ -41,13 +39,11 @@ org.junit.vintage junit-vintage-engine - 5.7.0 test io.dapr durabletask-client - 1.5.10