From 6a25ae046d059cbb5d8a1d28f1a719f31cbd2df6 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 3 Apr 2020 16:50:45 +0800 Subject: [PATCH 01/10] Polish alibaba/spring-cloud-alibaba#1198 --- .../spring-cloud-starter-dubbo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml index c3f9cae81..547a81c4d 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml @@ -91,7 +91,7 @@ org.apache.zookeeper zookeeper - 3.4.12 + 3.4.14 true From 0d8e1c4b41ea12ef2144ed19b508cccf23ae89a1 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 3 Apr 2020 18:43:36 +0800 Subject: [PATCH 02/10] Add into pom.xml --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 2f5e411db..6afc5c56e 100644 --- a/pom.xml +++ b/pom.xml @@ -413,5 +413,18 @@ + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + \ No newline at end of file From a1981338525e2868a17f9225de291b01e844d0de Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 3 Apr 2020 23:48:57 +0800 Subject: [PATCH 03/10] Update pom.xml --- .gitignore | 8 + pom.xml | 150 +++++++++--------- spring-cloud-alibaba-coverage/pom.xml | 2 +- spring-cloud-alibaba-dependencies/pom.xml | 3 +- spring-cloud-alibaba-docs/pom.xml | 2 +- .../nacos-config-example/pom.xml | 6 +- .../nacos-discovery-consumer-example/pom.xml | 5 +- .../pom.xml | 5 +- .../nacos-discovery-provider-example/pom.xml | 5 +- .../pom.xml | 5 +- .../pom.xml | 5 +- .../pom.xml | 5 +- .../nacos-discovery-example/pom.xml | 6 +- .../nacos-gateway-discovery-example/pom.xml | 5 +- .../nacos-gateway-provider-example/pom.xml | 5 +- .../nacos-gateway-example/pom.xml | 5 +- spring-cloud-alibaba-examples/pom.xml | 2 +- .../rocketmq-consume-example/pom.xml | 5 +- .../rocketmq-produce-example/pom.xml | 5 +- .../seata-example/account-service/pom.xml | 5 +- .../seata-example/business-service/pom.xml | 4 +- .../seata-example/order-service/pom.xml | 4 +- .../seata-example/storage-service/pom.xml | 4 +- .../sentinel-core-example/pom.xml | 5 +- .../sentinel-dubbo-api/pom.xml | 5 +- .../sentinel-dubbo-consumer-example/pom.xml | 5 +- .../sentinel-dubbo-provider-example/pom.xml | 5 +- .../sentinel-feign-consumer-example/pom.xml | 5 +- .../sentinel-feign-provider-example/pom.xml | 5 +- .../pom.xml | 5 +- .../sentinel-webflux-example/pom.xml | 5 +- .../sentinel-zuul-example/pom.xml | 5 +- .../pom.xml | 4 +- .../spring-cloud-dubbo-client-sample/pom.xml | 3 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../spring-cloud-dubbo-sample-api/pom.xml | 2 +- .../spring-cloud-dubbo-server-sample/pom.xml | 4 +- .../pom.xml | 2 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../spring-cloud-bus-rocketmq-example/pom.xml | 7 +- spring-cloud-alibaba-starters/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nacos/SidecarNacosDiscoveryClient.java | 8 +- .../spring-cloud-starter-bus-rocketmq/pom.xml | 2 +- .../spring-cloud-starter-dubbo/pom.xml | 2 +- .../pom.xml | 2 +- 57 files changed, 205 insertions(+), 161 deletions(-) diff --git a/.gitignore b/.gitignore index 942b16d37..a6bd7fbea 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,11 @@ hs_err_pid* target .DS_Store +# temp ignore +*.cache +*.diff +*.patch +*.tmp + +# Maven ignore +.flattened-pom.xml diff --git a/pom.xml b/pom.xml index 6afc5c56e..be8c9976e 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud spring-cloud-alibaba - 2.2.1.BUILD-SNAPSHOT + ${revision} pom Spring Cloud Alibaba Spring Cloud Alibaba @@ -72,6 +72,9 @@ + + 2.2.1.BUILD-SNAPSHOT + 2.2.2.RELEASE 2.2.2.RELEASE @@ -98,6 +101,9 @@ 3.7.0 2.8.2 2.21.0 + 3.1.1 + 1.6 + 1.1.0 1.6 0.8.3 @@ -348,83 +354,79 @@ - - spring - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - false - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - + release + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + verify + + sign + + + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + - spring-releases - Spring Releases - https://repo.spring.io/release - - false - + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - false - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/libs-release-local - - false - - - + - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - \ No newline at end of file diff --git a/spring-cloud-alibaba-coverage/pom.xml b/spring-cloud-alibaba-coverage/pom.xml index d05bf6ada..eb2cc75b7 100644 --- a/spring-cloud-alibaba-coverage/pom.xml +++ b/spring-cloud-alibaba-coverage/pom.xml @@ -8,7 +8,7 @@ com.alibaba.cloud spring-cloud-alibaba - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index d572ce101..387ba8117 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -12,12 +12,13 @@ com.alibaba.cloud spring-cloud-alibaba-dependencies - 2.2.1.BUILD-SNAPSHOT + ${revision} pom Spring Cloud Alibaba Dependencies Spring Cloud Alibaba Dependencies + 2.2.1.BUILD-SNAPSHOT 1.7.1 3.1.0 1.1.0 diff --git a/spring-cloud-alibaba-docs/pom.xml b/spring-cloud-alibaba-docs/pom.xml index 6b9159deb..1c03ca68f 100644 --- a/spring-cloud-alibaba-docs/pom.xml +++ b/spring-cloud-alibaba-docs/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml index c2c1aa7f7..cf5e5ada5 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml @@ -5,15 +5,15 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 - nacos-config-example - jar + Spring Cloud Starter Alibaba Nacos Config Example Example demonstrating how to use nacos config + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml index 6836e9867..4b0e61f19 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-discovery-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-discovery-consumer-example - jar + Spring Cloud Starter Alibaba Nacos Discovery Consumer Example Example demonstrating how to use nacos discovery + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/pom.xml index 69d86bb53..2771c8021 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-discovery-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-discovery-consumer-sclb-example - jar + Spring Cloud Starter Alibaba Nacos Discovery x Load Balancer Example Example demonstrating how to use nacos discovery + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml index 09a5e33a9..6e9b11d19 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-discovery-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-discovery-provider-example - jar + Spring Cloud Starter Alibaba Nacos Discovery Provider Example Example demonstrating how to use nacos discovery + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client-example/pom.xml index e2b2d1d68..82cdbcd44 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-discovery-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-discovery-spring-cloud-config-client-example - jar + Spring Cloud Starter Alibaba Nacos Discovery x Config Client Example Example demonstrating how to use nacos discovery + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/pom.xml index 0402b2afe..a04990fe0 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-discovery-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-discovery-spring-cloud-config-server-example - jar + Spring Cloud Starter Alibaba Nacos Discovery x Config Server Example Example demonstrating how to use nacos discovery + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/pom.xml index b021aa3d1..4d39842f2 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-discovery-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-reactivediscovery-consumer-example - jar + Spring Cloud Starter Alibaba Nacos Discovery Reactive Example Example demonstrating how to use nacos discovery + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml index b067a0419..0efdc8c91 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml @@ -5,15 +5,15 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 - nacos-discovery-example - pom + Spring Cloud Starter Alibaba Nacos Discovery Examples Example demonstrating how to use nacos discovery + pom diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml index 726195a31..97e014c7c 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-gateway-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-gateway-discovery-example - jar + Spring Cloud Starter Alibaba Nacos Discovery x Gateway Example Example demonstrating how to use gateway with nacos + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml index a7d78adb5..2662ab51b 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud nacos-gateway-example - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 nacos-gateway-provider-example - jar + Spring Cloud Starter Alibaba Nacos Discovery x Gateway - Provider Example Example demonstrating how to use gateway with nacos + jar diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml index 3c1b6f7b4..7c3552a0a 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 nacos-gateway-example - pom + Spring Cloud Starter Alibaba Nacos Discovery x Gateway Examples Example demonstrating how to use gateway with nacos + pom diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml index 7187c96e0..157fc502c 100644 --- a/spring-cloud-alibaba-examples/pom.xml +++ b/spring-cloud-alibaba-examples/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml index 27ea18a78..00bf7382e 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 rocketmq-consume-example - jar + Spring Cloud Starter Stream Alibaba RocketMQ Consume Example Example demonstrating how to use rocketmq consume + jar diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml index e51cd32c9..31de576b3 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 rocketmq-produce-example - jar + Spring Cloud Starter Stream Alibaba RocketMQ Produce Example Example demonstrating how to use rocketmq produce + jar diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml index a4fbd44bd..99aa658f4 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml @@ -5,11 +5,14 @@ spring-cloud-alibaba-examples com.alibaba.cloud - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 + account-service + Spring Cloud Starter Alibaba Seata Example - Account Service + jar diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml index 54f24ffd8..0ae95db73 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml @@ -5,11 +5,13 @@ spring-cloud-alibaba-examples com.alibaba.cloud - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 business-service + Spring Cloud Starter Alibaba Seata Example - Business Service + jar diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml index 7d35ee32d..a856310de 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml @@ -5,11 +5,13 @@ spring-cloud-alibaba-examples com.alibaba.cloud - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 order-service + Spring Cloud Starter Alibaba Seata Example - Business Service + jar diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml index 276be3a8f..a2cbdccd4 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml @@ -5,11 +5,13 @@ spring-cloud-alibaba-examples com.alibaba.cloud - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 storage-service + Spring Cloud Starter Alibaba Seata Example - Storage Service + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml index 597311dc5..650e46e7f 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 sentinel-core-example - jar + Spring Cloud Starter Alibaba Sentinel Core Example Example demonstrating how to use sentinel + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml index ad4190ad2..dcb0d8d43 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml @@ -5,14 +5,15 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../../pom.xml 4.0.0 sentinel-dubbo-api - jar + Spring Cloud Starter Alibaba Sentinel x Dubbo - API api for sentinel dubbo example + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml index 3c448d554..e1f0552b9 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../../pom.xml 4.0.0 sentinel-dubbo-consumer-example - jar + Spring Cloud Starter Alibaba Sentinel x Dubbo - Consumer Example Example demonstrating how to use sentinel with dubbo + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml index e35522f7c..78c640927 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../../pom.xml 4.0.0 sentinel-dubbo-provider-example - jar + Spring Cloud Starter Alibaba Sentinel x Dubbo - Provider Example Example demonstrating how to use sentinel with dubbo + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/pom.xml index 019e1bf8e..2ef109659 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../../pom.xml 4.0.0 sentinel-feign-consumer-example - jar + Spring Cloud Starter Alibaba Sentinel x Feign - Consumer Example Example demonstrating how to use sentinel with feign + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/pom.xml index ddfcedddd..8f31d86a7 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../../pom.xml 4.0.0 sentinel-feign-provider-example - jar + Spring Cloud Starter Alibaba Sentinel x Feign - Provider Example Example demonstrating how to use sentinel with feign + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml index 46efa2518..bfe1badc0 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 sentinel-spring-cloud-gateway-example - jar + Spring Cloud Starter Alibaba Sentinel x Gateway Example Example demonstrating how to use sentinel with spring cloud gateway + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml index ce3a18e3c..3b3a7c1a0 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 sentinel-webflux-example - jar + Spring Cloud Starter Alibaba Sentinel x WebFlux Example Example demonstrating how to use sentinel with webflux + jar diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml index 5116bd6b2..6fff4420a 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml @@ -5,15 +5,16 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 sentinel-zuul-example - jar + Spring Cloud Starter Alibaba Sentinel x Zuul Example Example demonstrating how to use sentinel with zuul + jar diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml index 2a6990b1c..75ed08831 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml @@ -5,14 +5,14 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml 4.0.0 com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} Spring Cloud Alibaba Dubbo Examples pom diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml index b850d55f4..c37db212c 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml 4.0.0 @@ -13,7 +13,6 @@ com.alibaba.cloud spring-cloud-dubbo-client-sample Spring Cloud Dubbo Client Sample - 2.2.1.BUILD-SNAPSHOT diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml index e46c74c7d..3b855121c 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml 4.0.0 diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml index c2ecf556c..d7e932e7f 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml 4.0.0 diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml index 219365b75..d434ebb10 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml 4.0.0 diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml index f3ae752ce..8727237fe 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} 4.0.0 diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml index cbf3aac6f..21e17c6dd 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml @@ -14,7 +14,7 @@ com.alibaba.cloud spring-cloud-dubbo-server-sample Spring Cloud Dubbo Server Sample - 2.2.1.BUILD-SNAPSHOT + ${revision} diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml index b619a7cc9..b39b23ceb 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-dubbo-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml 4.0.0 diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml index be092e0d8..906c3e04f 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-consul-example/pom.xml @@ -4,13 +4,15 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 spring-cloud-alibaba-sidecar-consul-example + Spring Cloud Starter Alibaba Sidecar x Consul Example Example demonstrating how to use Spring Cloud Alibaba Sidecar with consul + jar diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml index 3aa59a76a..690d2031b 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/pom.xml @@ -4,13 +4,15 @@ com.alibaba.cloud spring-cloud-alibaba-examples - 2.2.1.BUILD-SNAPSHOT + ${revision} ../../pom.xml 4.0.0 spring-cloud-alibaba-sidecar-nacos-example + Spring Cloud Starter Alibaba Sidecar x Nacos Example Example demonstrating how to use Spring Cloud Alibaba Sidecar with nacos + jar diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml index 1150cc0bf..c0bbf98a1 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml @@ -5,14 +5,15 @@ spring-cloud-alibaba-examples com.alibaba.cloud - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml 4.0.0 spring-cloud-bus-rocketmq-example - Spring Cloud Bus RocketMQ Example - + Spring Cloud Starter Bus Alibaba RocketMQ Example + Example demonstrating how to use Spring Cloud Bus RocketMQ + jar diff --git a/spring-cloud-alibaba-starters/pom.xml b/spring-cloud-alibaba-starters/pom.xml index 366eeaec1..1249b019e 100644 --- a/spring-cloud-alibaba-starters/pom.xml +++ b/spring-cloud-alibaba-starters/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/pom.xml index 794dde469..3b879f526 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-datasource/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/pom.xml index 3b5b879b1..2461c672b 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/pom.xml index 219cbbd78..90f0f0ff3 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-circuitbreaker-sentinel/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config-server/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config-server/pom.xml index 1b0e8a4b4..483914cf8 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config-server/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config-server/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/pom.xml index 0c555f913..0a36d2c80 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/pom.xml index 8916a150e..1751f4fca 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/pom.xml index 970ae6788..3f3e1a2ed 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml index 9b0d62896..0bbd4cb6c 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/pom.xml index 0dc645386..f4af6d57c 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/pom.xml @@ -6,7 +6,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java index 15b6f35c5..92bc65ebf 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java @@ -40,8 +40,8 @@ public class SidecarNacosDiscoveryClient implements SidecarDiscoveryClient { @Override public void registerInstance(String applicationName, String ip, Integer port) { try { - this.nacosDiscoveryProperties.namingServiceInstance() - .registerInstance(applicationName, nacosDiscoveryProperties.getGroup(), ip, port); + this.nacosDiscoveryProperties.namingServiceInstance().registerInstance( + applicationName, nacosDiscoveryProperties.getGroup(), ip, port); } catch (NacosException e) { log.warn("nacos exception happens", e); @@ -51,8 +51,8 @@ public class SidecarNacosDiscoveryClient implements SidecarDiscoveryClient { @Override public void deregisterInstance(String applicationName, String ip, Integer port) { try { - this.nacosDiscoveryProperties.namingServiceInstance() - .deregisterInstance(applicationName, nacosDiscoveryProperties.getGroup(), ip, port); + this.nacosDiscoveryProperties.namingServiceInstance().deregisterInstance( + applicationName, nacosDiscoveryProperties.getGroup(), ip, port); } catch (NacosException e) { log.warn("nacos exception happens", e); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-bus-rocketmq/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-bus-rocketmq/pom.xml index c7c529890..498b6aa93 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-bus-rocketmq/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-bus-rocketmq/pom.xml @@ -6,7 +6,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml index 547a81c4d..713378ea0 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/pom.xml @@ -6,7 +6,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/pom.xml b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/pom.xml index 9203d1ca9..ec44c9d7a 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/pom.xml +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/pom.xml @@ -5,7 +5,7 @@ com.alibaba.cloud spring-cloud-alibaba-starters - 2.2.1.BUILD-SNAPSHOT + ${revision} ../pom.xml From f2c7ecaafc773469d2c2e90d92b035bf035717c2 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Sat, 4 Apr 2020 00:32:58 +0800 Subject: [PATCH 04/10] Update pom.xml --- pom.xml | 14 +++ spring-cloud-alibaba-dependencies/pom.xml | 146 +++++++++++++--------- 2 files changed, 102 insertions(+), 58 deletions(-) diff --git a/pom.xml b/pom.xml index be8c9976e..8696751a7 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ 3.7.0 2.8.2 2.21.0 + 2.2.1 3.1.1 1.6 1.1.0 @@ -358,6 +359,19 @@ release + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + package + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 387ba8117..7bb2740ab 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -25,6 +25,12 @@ 1.2.1 0.8.0 1.0.6 + + + 2.2.1 + 3.1.1 + 1.6 + 1.1.0 @@ -253,67 +259,91 @@ - - spring - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - false - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - + release + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + verify + + sign + + + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + - spring-releases - Spring Releases - https://repo.spring.io/release - - false - + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - false - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/libs-release-local - - false - - - + From 210271632301d590b58a24bd0d1b80fcfca43553 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Sat, 4 Apr 2020 01:11:03 +0800 Subject: [PATCH 05/10] Update pom.xml --- mvnw | 3 ++- spring-cloud-alibaba-coverage/pom.xml | 22 ++++++++++----------- spring-cloud-alibaba-dependencies/pom.xml | 24 +++++++++++------------ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/mvnw b/mvnw index 675cb6b08..761189a97 100755 --- a/mvnw +++ b/mvnw @@ -227,7 +227,7 @@ export MAVEN_CMD_LINE_ARGS WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain echo "Running version check" -VERSION=$( sed '\!//' -e 's!.*$!!' ) +VERSION=$( sed '\!//' -e 's!.*$!!' ) echo "The found version is [${VERSION}]" if echo $VERSION | egrep -q 'M|RC'; then @@ -249,5 +249,6 @@ fi exec "$JAVACMD" \ $MAVEN_OPTS \ -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Drevision=${VERSION}" \ "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@" \ No newline at end of file diff --git a/spring-cloud-alibaba-coverage/pom.xml b/spring-cloud-alibaba-coverage/pom.xml index eb2cc75b7..9df89df81 100644 --- a/spring-cloud-alibaba-coverage/pom.xml +++ b/spring-cloud-alibaba-coverage/pom.xml @@ -19,66 +19,66 @@ com.alibaba.cloud spring-cloud-alibaba-sentinel-datasource - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-circuitbreaker-sentinel - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-seata - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config-server - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-stream-rocketmq - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-bus-rocketmq - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-sidecar - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-dubbo - ${project.version} + ${revision} diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 7bb2740ab..a7cf151b3 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -178,73 +178,73 @@ com.alibaba.cloud spring-cloud-alibaba-sentinel-datasource - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-alibaba-sentinel-gateway - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-circuitbreaker-sentinel - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-seata - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config-server - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-stream-rocketmq - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-bus-rocketmq - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-alibaba-sidecar - ${project.version} + ${revision} com.alibaba.cloud spring-cloud-starter-dubbo - ${project.version} + ${revision} From 7962b1fb6dec1b65c65d76355bc2f8c33afc1c8e Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Sat, 4 Apr 2020 01:15:29 +0800 Subject: [PATCH 06/10] Update pom.xml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f260a246..3beeaa625 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: - ~/.m2 - run: name: "Running build" - command: ./mvnw -Pdocs clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dgpg.skip + command: ./mvnw clean install -U -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dgpg.skip - run: name: "Aggregate test results" when: always From ce1fd65016391f79def401e730befe8c12833954 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 10 Apr 2020 10:17:43 +0800 Subject: [PATCH 07/10] Use ${session.executionRootDirectory} as the root directory in Maven project --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8696751a7..468b02249 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ - eclipse/checkstyle-suppressions.xml + ${session.executionRootDirectory}/eclipse/checkstyle-suppressions.xml true true true From 5cdb50383c0e4619fd1b35de8455e65d250a5e4b Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 10 Apr 2020 10:24:57 +0800 Subject: [PATCH 08/10] Remove the startup arguments for Maven --- .mvn/maven.config | 1 - 1 file changed, 1 deletion(-) diff --git a/.mvn/maven.config b/.mvn/maven.config index 3b8cf46e1..e69de29bb 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +0,0 @@ --DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local -P spring From d736d13538f48a863709588bcfcc06a57240405e Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 10 Apr 2020 10:40:47 +0800 Subject: [PATCH 09/10] Polish alibaba/spring-cloud-alibaba#1342 : [Infrastructure] Upgrade the Dubbo #1342 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 468b02249..e1732e055 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ 1.7.25 - 2.7.4.1 + 2.7.6 4.0.1 From d82aaa81b3c1ba5295b9f168a7a67e01722641f2 Mon Sep 17 00:00:00 2001 From: mercyblitz Date: Fri, 10 Apr 2020 10:49:59 +0800 Subject: [PATCH 10/10] Polish alibaba/spring-cloud-alibaba#1342 : [Infrastructure] Upgrade the Dubbo #1342 --- .../com/alibaba/cloud/dubbo/annotation/DubboTransported.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java index c8c61700a..efe083ea0 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java @@ -30,7 +30,7 @@ import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.client.RestTemplate; -import static org.apache.dubbo.rpc.cluster.Constants.DEFAULT_RETRIES; +import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_RETRIES; /** * {@link DubboTransported @DubboTransported} annotation indicates that the traditional