From 932846a11b98724a295ba245a3204bd76e63e333 Mon Sep 17 00:00:00 2001 From: LLLLimbo <706725357@qq.com> Date: Wed, 31 Mar 2021 14:26:02 +0800 Subject: [PATCH 1/6] Adjusted the configuration of Maven. --- examples/pom.xml | 25 +- pom.xml | 512 +++++++++++++++++++++++++++++------------ sdk-actors/pom.xml | 21 +- sdk-autogen/pom.xml | 11 - sdk-springboot/pom.xml | 52 +---- sdk/pom.xml | 20 +- 6 files changed, 383 insertions(+), 258 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index db569840c6..e17ab73c60 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,10 +10,8 @@ 1.1.0-SNAPSHOT - io.dapr dapr-sdk-examples jar - 1.1.0-SNAPSHOT dapr-sdk-examples @@ -31,33 +29,27 @@ 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 @@ -67,17 +59,14 @@ 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 @@ -97,35 +86,29 @@ 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} @@ -167,7 +150,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 11 @@ -182,7 +164,6 @@ org.apache.maven.plugins maven-site-plugin - 3.9.1 true diff --git a/pom.xml b/pom.xml index 407119b5d3..ca5522471c 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,17 +14,63 @@ UTF-8 + 8 + 8 + true + + 1.33.1 3.13.0 - https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto + 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 - 8 - 8 - true + 3.8.2 + 2.9 + 3.2.0 + 3.8.1 + 2.7 + 3.2.1 + + true - 4.0.0-RC1 true @@ -46,6 +92,109 @@ + + 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 @@ -61,158 +210,217 @@ junit junit - 4.13.1 - test + ${junit.version} - org.mockito - mockito-core - 3.6.0 - test + javax.annotation + javax.annotation-api + ${javax.annotation-api.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 - - + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + + + 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.springframework.boot + spring-boot-maven-plugin + ${springboot.version} + + + + + + + + + org.apache.maven.plugins maven-project-info-reports-plugin - 2.9 + ${maven-project-info-reports-plugin.version} @@ -223,7 +431,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + ${maven-javadoc-plugin.version} aggregate @@ -237,7 +445,9 @@ 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.* + @@ -260,9 +470,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 a05b0a9d4f..397977a471 100644 --- a/sdk-actors/pom.xml +++ b/sdk-actors/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-actors jar - 1.1.0-SNAPSHOT dapr-sdk-actors SDK for Actors on Dapr @@ -35,7 +34,6 @@ io.dapr dapr-sdk - ${project.version} junit @@ -47,28 +45,24 @@ mockito-core test - - com.github.gmazzo - okhttp-mock - 1.3.2 - test - + + com.github.gmazzo + okhttp-mock + 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 @@ -78,7 +72,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -92,7 +85,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 attach-javadocs @@ -105,7 +97,6 @@ org.jacoco jacoco-maven-plugin - 0.8.6 default-prepare-agent @@ -133,7 +124,7 @@ BUNDLE - + LINE COVEREDRATIO 80% diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index 196f5e3873..d2fc1f2a7e 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-autogen jar - 1.1.0-SNAPSHOT dapr-sdk-autogen Auto-generated SDK for Dapr @@ -26,7 +25,6 @@ javax.annotation javax.annotation-api - 1.3.2 provided @@ -47,11 +45,6 @@ grpc-testing test - - io.grpc - grpc-stub - 1.33.1 - @@ -59,7 +52,6 @@ com.googlecode.maven-download-plugin download-maven-plugin - 1.6.0 getCommonProto @@ -108,7 +100,6 @@ com.github.os72 protoc-jar-maven-plugin - 3.11.4 generate-sources @@ -142,7 +133,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -155,7 +145,6 @@ 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 163967570f..ed3256df0e 100644 --- a/sdk-springboot/pom.xml +++ b/sdk-springboot/pom.xml @@ -12,7 +12,6 @@ dapr-sdk-springboot jar - 1.1.0-SNAPSHOT dapr-sdk-springboot SDK extension for Springboot @@ -29,31 +28,16 @@ false - 2.3.5.RELEASE - - - - org.springframework.boot - spring-boot-dependencies - ${springboot.version} - pom - import - - - - io.dapr dapr-sdk - ${project.version} io.dapr dapr-sdk-actors - ${project.version} junit @@ -65,42 +49,31 @@ mockito-core test - - com.github.gmazzo - okhttp-mock - 1.3.2 - test - + + com.github.gmazzo + okhttp-mock + 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 - 5.2.10.RELEASE - compile - + + org.springframework + spring-context + compile + org.springframework.boot spring-boot-autoconfigure @@ -119,7 +92,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -133,7 +105,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 attach-javadocs @@ -146,7 +117,6 @@ org.jacoco jacoco-maven-plugin - 0.8.6 default-prepare-agent @@ -174,7 +144,7 @@ BUNDLE - + LINE COVEREDRATIO 80% diff --git a/sdk/pom.xml b/sdk/pom.xml index 8b3d77289f..7208c92861 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -12,10 +12,9 @@ dapr-sdk jar - 1.1.0-SNAPSHOT dapr-sdk SDK for Dapr - + @@ -35,22 +34,18 @@ 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 @@ -65,49 +60,41 @@ 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 @@ -117,7 +104,6 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 attach-sources @@ -130,7 +116,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 attach-javadocs @@ -143,7 +128,6 @@ org.jacoco jacoco-maven-plugin - 0.8.6 default-prepare-agent @@ -171,7 +155,7 @@ BUNDLE - + LINE COVEREDRATIO 80% From 02b4fc4e383819cc9ff8d1727325d2249f25019d Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Fri, 2 Apr 2021 18:56:29 -0700 Subject: [PATCH 2/6] Update pom.xml --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ca5522471c..0ca69067b6 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,7 @@ 5.7.0 - https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto - + https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto 1.6.0 From 0169cba3e1433baa75e59f16e83b752e8b5275dd Mon Sep 17 00:00:00 2001 From: LLLLimbo <706725357@qq.com> Date: Tue, 6 Apr 2021 13:51:07 +0800 Subject: [PATCH 3/6] Remove os-maven-plugin and spring-boot-maven-plugin in parent pom --- pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pom.xml b/pom.xml index 0ca69067b6..2523bb7b55 100644 --- a/pom.xml +++ b/pom.xml @@ -220,13 +220,6 @@ - - - kr.motd.maven - os-maven-plugin - ${os-maven-plugin.version} - - @@ -399,11 +392,6 @@ ${maven-site-plugin.version} - - org.springframework.boot - spring-boot-maven-plugin - ${springboot.version} - From d2cd78af1f70e7192e70d1fb317c2b2b36e26db3 Mon Sep 17 00:00:00 2001 From: LLLLimbo <706725357@qq.com> Date: Thu, 8 Apr 2021 07:08:34 +0800 Subject: [PATCH 4/6] Add version of spring-boot-maven-plugin in the example pom. Add spring-boot-dependencies dependency management in sdk-springboot. Add maven-compiler-plugin to the parent pom's pluginManagement Remove protoc-jar-maven-plugin in example's dependencies. --- examples/pom.xml | 6 +----- pom.xml | 10 ++++++++-- sdk-springboot/pom.xml | 12 ++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index e17ab73c60..112f2ef7eb 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -51,11 +51,6 @@ com.google.protobuf protobuf-java-util - - com.github.os72 - protoc-jar-maven-plugin - 3.10.1 - org.springframework.boot spring-boot-starter-web @@ -171,6 +166,7 @@ org.springframework.boot spring-boot-maven-plugin + ${springboot.version} diff --git a/pom.xml b/pom.xml index 2523bb7b55..d6461c2f09 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,8 @@ 5.7.0 - https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto + 1.6.0 @@ -392,6 +393,12 @@ ${maven-site-plugin.version} + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + @@ -418,7 +425,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven-javadoc-plugin.version} aggregate diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml index ed3256df0e..a4d75a3595 100644 --- a/sdk-springboot/pom.xml +++ b/sdk-springboot/pom.xml @@ -30,6 +30,18 @@ false + + + + org.springframework.boot + spring-boot-dependencies + ${springboot.version} + pom + import + + + + io.dapr From b012f6b5a0d987f938fafd79b09349c22febcd9e Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Thu, 8 Apr 2021 10:06:30 -0700 Subject: [PATCH 5/6] Update pom.xml --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d6461c2f09..dcf3ab64dd 100644 --- a/pom.xml +++ b/pom.xml @@ -44,8 +44,7 @@ 5.7.0 - https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto - + https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto 1.6.0 From 2761e02a72dea267803ec247ba618a073304ade8 Mon Sep 17 00:00:00 2001 From: limbo Date: Fri, 30 Apr 2021 17:34:19 +0800 Subject: [PATCH 6/6] Add plugins back in parent pom --- pom.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pom.xml b/pom.xml index dcf3ab64dd..c526690a00 100644 --- a/pom.xml +++ b/pom.xml @@ -401,6 +401,37 @@ + + + org.jacoco + jacoco-maven-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + org.codehaus.mojo + failsafe-maven-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + com.github.spotbugs + spotbugs-maven-plugin + + + org.apache.maven.plugins + maven-site-plugin + + +