From 449dfe25372fd45c660e09f8c7db8aa280a5a6a5 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Thu, 29 Apr 2021 17:57:38 -0700 Subject: [PATCH] Revert "Adjusted the configuration of Maven. (#532)" This reverts commit 5cc79811cb9edb673a394917eee261deef24944c. --- examples/pom.xml | 31 ++- pom.xml | 502 ++++++++++++----------------------------- sdk-actors/pom.xml | 21 +- sdk-autogen/pom.xml | 11 + sdk-springboot/pom.xml | 40 +++- sdk/pom.xml | 20 +- 6 files changed, 250 insertions(+), 375 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 112f2ef7eb..db569840c6 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 @@ -10,8 +10,10 @@ 1.1.0-SNAPSHOT + io.dapr dapr-sdk-examples jar + 1.1.0-SNAPSHOT dapr-sdk-examples @@ -29,39 +31,53 @@ commons-cli commons-cli + 1.4 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} + + + com.github.os72 + protoc-jar-maven-plugin + 3.10.1 org.springframework.boot spring-boot-starter-web + 2.3.5.RELEASE org.springframework.boot spring-boot-autoconfigure + 2.3.5.RELEASE com.jayway.jsonpath json-path + 2.4.0 io.opentelemetry @@ -81,29 +97,35 @@ org.junit.jupiter junit-jupiter + RELEASE compile org.mockito mockito-core + 3.6.0 compile org.junit.platform junit-platform-console-standalone + 1.7.0 compile io.dapr dapr-sdk-springboot + ${project.version} io.dapr dapr-sdk-actors + ${project.version} io.dapr dapr-sdk + ${project.version} @@ -145,6 +167,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 11 @@ -159,6 +182,7 @@ org.apache.maven.plugins maven-site-plugin + 3.9.1 true @@ -166,7 +190,6 @@ org.springframework.boot spring-boot-maven-plugin - ${springboot.version} diff --git a/pom.xml b/pom.xml index dcf3ab64dd..407119b5d3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.dapr @@ -14,62 +14,17 @@ UTF-8 - 8 - 8 - true - - 1.33.1 3.13.0 - 2.4.0 - 2.11.3 - - 1.3.2 - 3.3.11.RELEASE - 4.9.0 - 2.3.5.RELEASE - - - 1.33.1 - 1.3.2 - 1.4 - 1.19.0 - 2.11.3 - - 3.6.0 - - 4.13.1 - 1.7.0 - RELEASE - 5.7.0 - - https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto - - - 1.6.0 - 3.11.4 1.6.2 - 0.8.6 - 1.6.8 - 2.4.3-alpha-1 - 8.37 - 4.1.4 - 4.0.0-RC1 - - 1.6 - 3.1.1 3.1.1 1.8 - 3.8.2 - 2.9 - 3.2.0 - 3.8.1 - 2.7 - 3.2.1 - - + 8 + 8 + true true + 4.0.0-RC1 true @@ -91,109 +46,6 @@ - - io.dapr - dapr-sdk-examples - ${project.version} - - - io.dapr - dapr-sdk - ${project.version} - - - io.dapr - dapr-sdk-autogen - ${project.version} - - - io.dapr - dapr-sdk-actors - ${project.version} - - - io.dapr - dapr-sdk-springboot - ${project.version} - - - - org.junit.platform - junit-platform-console-standalone - ${junit-platform-console-standalone.version} - - - org.mockito - mockito-core - ${mockito-core.version} - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - - - io.grpc - grpc-testing - ${grpc-testing.version} - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - com.google.protobuf - protobuf-java-util - ${protobuf.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter-engine.version} - - - com.github.stefanbirkner - system-rules - ${system-rules.version} - - - com.github.gmazzo - okhttp-mock - ${okhttp-mock.version} - - - commons-cli - commons-cli - ${commons-cli.version} - - - com.jayway.jsonpath - json-path - ${json-path.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson-dataformat-xml.version} - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - io.projectreactor - reactor-core - ${reactor-core.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - io.grpc grpc-bom @@ -209,211 +61,158 @@ junit junit - ${junit.version} + 4.13.1 + test - javax.annotation - javax.annotation-api - ${javax.annotation-api.version} + org.mockito + mockito-core + 3.6.0 + test - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven-deploy-plugin.version} - - true - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - - prepare-agent - - - - report - test - - report - - - - - - - com.googlecode.maven-download-plugin - download-maven-plugin - ${download-maven-plugin.version} - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - --batch - --pinentry-mode - loopback - - - - - - - - com.github.os72 - protoc-jar-maven-plugin - ${protoc-jar-maven-plugin.version} - - - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - ossrh - https://oss.sonatype.org/ - true - - - - - org.codehaus.mojo - failsafe-maven-plugin - ${failsafe-maven-plugin.version} - - - - integration-test - verify - - - - ${skipITs} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${maven-checkstyle-plugin.version} - - checkstyle.xml - UTF-8 - true - warning - true - true - false - - - - validate - validate - - check - - - - - - com.puppycrawl.tools - checkstyle - ${checkstyle.version} - - - - - - com.github.spotbugs - spotbugs-maven-plugin - ${spotbugs-maven-plugin.version} - - - - com.github.spotbugs - spotbugs - ${spotbugs.version} - - - - ${spotbugs.fail} - true - - - - validate - validate - - check - - - - - - - org.apache.maven.plugins - maven-site-plugin - ${maven-site-plugin.version} - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - - - - + + + org.jacoco + jacoco-maven-plugin + 0.8.6 + + + + prepare-agent + + + + report + test + + report + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + --batch + --pinentry-mode + loopback + + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + true + + ossrh + https://oss.sonatype.org/ + true + + + + org.codehaus.mojo + failsafe-maven-plugin + 2.4.3-alpha-1 + + + + integration-test + verify + + + + ${skipITs} + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.1 + + checkstyle.xml + UTF-8 + true + warning + true + true + false + + + + validate + validate + + check + + + + + + com.puppycrawl.tools + checkstyle + 8.37 + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.1.4 + + + + com.github.spotbugs + spotbugs + ${spotbugs.version} + + + + ${spotbugs.fail} + true + + + + validate + validate + + check + + + + + + org.apache.maven.plugins + maven-site-plugin + 3.8.2 + + - - - - org.apache.maven.plugins maven-project-info-reports-plugin - ${maven-project-info-reports-plugin.version} + 2.9 @@ -424,6 +223,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.2.0 aggregate @@ -437,9 +237,7 @@ false true site - - io.dapr.examples:io.dapr.springboot:io.dapr.examples.*:io.dapr.springboot.* - + io.dapr.examples:io.dapr.springboot:io.dapr.examples.*:io.dapr.springboot.* @@ -462,9 +260,9 @@ - https://github.com/dapr/java-sdk - scm:git:https://github.com/dapr/java-sdk.git - HEAD + https://github.com/dapr/java-sdk + scm:git:https://github.com/dapr/java-sdk.git + HEAD diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml index 397977a471..a05b0a9d4f 100644 --- a/sdk-actors/pom.xml +++ b/sdk-actors/pom.xml @@ -12,6 +12,7 @@ dapr-sdk-actors jar + 1.1.0-SNAPSHOT dapr-sdk-actors SDK for Actors on Dapr @@ -34,6 +35,7 @@ io.dapr dapr-sdk + ${project.version} junit @@ -45,24 +47,28 @@ mockito-core test - - com.github.gmazzo - okhttp-mock - test - + + com.github.gmazzo + okhttp-mock + 1.3.2 + test + org.junit.jupiter junit-jupiter-api + 5.5.2 test commons-cli commons-cli + 1.4 test org.springframework.boot spring-boot-starter-web + 2.3.5.RELEASE test @@ -72,6 +78,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -85,6 +92,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.2.0 attach-javadocs @@ -97,6 +105,7 @@ org.jacoco jacoco-maven-plugin + 0.8.6 default-prepare-agent @@ -124,7 +133,7 @@ BUNDLE - + LINE COVEREDRATIO 80% diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index d2fc1f2a7e..196f5e3873 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -12,6 +12,7 @@ dapr-sdk-autogen jar + 1.1.0-SNAPSHOT dapr-sdk-autogen Auto-generated SDK for Dapr @@ -25,6 +26,7 @@ javax.annotation javax.annotation-api + 1.3.2 provided @@ -45,6 +47,11 @@ grpc-testing test + + io.grpc + grpc-stub + 1.33.1 + @@ -52,6 +59,7 @@ com.googlecode.maven-download-plugin download-maven-plugin + 1.6.0 getCommonProto @@ -100,6 +108,7 @@ com.github.os72 protoc-jar-maven-plugin + 3.11.4 generate-sources @@ -133,6 +142,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -145,6 +155,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.2.0 attach-javadocs diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml index a4d75a3595..163967570f 100644 --- a/sdk-springboot/pom.xml +++ b/sdk-springboot/pom.xml @@ -12,6 +12,7 @@ dapr-sdk-springboot jar + 1.1.0-SNAPSHOT dapr-sdk-springboot SDK extension for Springboot @@ -28,6 +29,7 @@ false + 2.3.5.RELEASE @@ -46,10 +48,12 @@ io.dapr dapr-sdk + ${project.version} io.dapr dapr-sdk-actors + ${project.version} junit @@ -61,31 +65,42 @@ mockito-core test - - com.github.gmazzo - okhttp-mock - test - + + com.github.gmazzo + okhttp-mock + 1.3.2 + test + org.junit.jupiter junit-jupiter-api + 5.5.2 test org.springframework spring-beans + 5.2.10.RELEASE compile + + org.springframework + spring-web + 5.2.10.RELEASE + compile + org.springframework spring-web + 5.2.10.RELEASE compile - - org.springframework - spring-context - compile - + + org.springframework + spring-context + 5.2.10.RELEASE + compile + org.springframework.boot spring-boot-autoconfigure @@ -104,6 +119,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -117,6 +133,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.2.0 attach-javadocs @@ -129,6 +146,7 @@ org.jacoco jacoco-maven-plugin + 0.8.6 default-prepare-agent @@ -156,7 +174,7 @@ BUNDLE - + LINE COVEREDRATIO 80% diff --git a/sdk/pom.xml b/sdk/pom.xml index 7208c92861..8b3d77289f 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -12,9 +12,10 @@ dapr-sdk jar + 1.1.0-SNAPSHOT dapr-sdk SDK for Dapr - + @@ -34,18 +35,22 @@ io.dapr dapr-sdk-autogen + ${project.version} com.fasterxml.jackson.core jackson-databind + 2.11.3 io.projectreactor reactor-core + 3.3.11.RELEASE com.squareup.okhttp3 okhttp + 4.9.0 junit @@ -60,41 +65,49 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml + 2.11.3 test commons-cli commons-cli + 1.4 test com.github.gmazzo okhttp-mock + 1.3.2 test com.github.stefanbirkner system-rules + 1.19.0 test org.junit.jupiter junit-jupiter-engine + 5.7.0 test org.springframework.boot spring-boot-starter-web + 2.3.5.RELEASE test org.springframework.boot spring-boot-autoconfigure + 2.3.5.RELEASE test io.grpc grpc-testing + 1.33.1 test @@ -104,6 +117,7 @@ org.apache.maven.plugins maven-source-plugin + 3.2.1 attach-sources @@ -116,6 +130,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.2.0 attach-javadocs @@ -128,6 +143,7 @@ org.jacoco jacoco-maven-plugin + 0.8.6 default-prepare-agent @@ -155,7 +171,7 @@ BUNDLE - + LINE COVEREDRATIO 80%