diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 04f59acaaa..fe4ebaa172 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -32,6 +32,8 @@ 11 11 11 + 1.19.8 + 5.10.2 @@ -43,6 +45,31 @@ pom import + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + + + org.junit.jupiter + junit-jupiter + ${junit.version} + + + org.testcontainers + junit-jupiter + ${testcontainers.version} + @@ -73,6 +100,7 @@ org.springframework.boot spring-boot-configuration-processor + ${springboot.version} true @@ -80,6 +108,7 @@ org.springframework.boot spring-boot-starter-test + ${springboot.version} test diff --git a/pom.xml b/pom.xml index 5ab3051c25..729eb0a71b 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 @@ -42,9 +45,9 @@ --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 + 1.20.5 3.4.3 1.7.0 @@ -95,7 +98,6 @@ org.mockito mockito-core 3.11.2 - test io.projectreactor @@ -120,12 +122,129 @@ 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 + ${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 + + + org.testcontainers + postgresql + ${testcontainers.version} + + + org.testcontainers + rabbitmq + ${testcontainers.version} + + + io.rest-assured + rest-assured + 5.5.1 + + + 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-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} + + + org.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + org.apache.maven.plugins + maven-source-plugin + ${maven-sources-plugin.version} + org.apache.maven.plugins maven-compiler-plugin @@ -174,6 +293,49 @@ true + + 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-tests/pom.xml b/sdk-tests/pom.xml index c448aa5866..c1ffacad0e 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -33,6 +33,11 @@ 1.5.16 3.9.1 1.20.0 + + + 0% + 1.11.4 @@ -45,6 +50,16 @@ pom import + + org.junit.platform + junit-platform-commons + ${junit-platform.version} + + + org.junit.platform + junit-platform-engine + ${junit-platform.version} + @@ -235,10 +250,63 @@ jakarta.servlet-api compile + + org.junit.platform + junit-platform-commons + test + + + org.junit.platform + junit-platform-engine + test + + + 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 diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index 9255bb13a0..b2e2d09406 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -12,19 +12,6 @@ consumer-app Spring Boot, Testcontainers and Dapr Integration Examples :: Consumer App - - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - org.springframework.boot @@ -37,16 +24,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 +38,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 +62,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..75a32364f7 100644 --- a/spring-boot-examples/pom.xml +++ b/spring-boot-examples/pom.xml @@ -15,6 +15,7 @@ true + 3.4.3 @@ -22,12 +23,23 @@ consumer-app + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + 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..b9ab6fcbfa 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -13,55 +13,36 @@ 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-starter-actuator - org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-test + 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 test org.testcontainers postgresql - 1.20.0 test org.testcontainers rabbitmq - 1.20.0 test @@ -76,12 +57,10 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} org.apache.maven.plugins maven-site-plugin - 3.12.1 true 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% - - - - - - - -