diff --git a/pom.xml b/pom.xml index b49ad4f0..1f85ad34 100644 --- a/pom.xml +++ b/pom.xml @@ -77,14 +77,16 @@ 2.1.3.RELEASE 2.1.3.RELEASE 2.1.3.RELEASE + 2.1.3.RELEASE 4.12 3.0 1.7.25 - 2.7.1 + 2.7.3 2.7.3 + 4.0.1 2.0.2 @@ -197,6 +199,14 @@ import + + org.springframework.cloud + spring-cloud-zookeeper-dependencies + ${spring-cloud-zookeeper.version} + pom + import + + org.apache.dubbo dubbo-spring-boot-starter diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 5c8e7f03..afbc09d2 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -22,14 +22,13 @@ 3.1.0 0.9.0 1.1.4 - 0.8.0 + 1.1.4 1.0.9 1.0.1 4.4.1 1.0.5 2.44.0 2.1.6 - 2.7.3 1.1.0 1.1.8.6 1.1.1 diff --git a/spring-cloud-alibaba-dubbo/pom.xml b/spring-cloud-alibaba-dubbo/pom.xml index f484def0..bbaa9324 100644 --- a/spring-cloud-alibaba-dubbo/pom.xml +++ b/spring-cloud-alibaba-dubbo/pom.xml @@ -13,12 +13,6 @@ spring-cloud-alibaba-dubbo Spring Cloud Alibaba Dubbo - - 2.1.3.RELEASE - 2.1.3.RELEASE - 4.0.1 - - @@ -101,7 +95,6 @@ org.springframework.cloud spring-cloud-starter-zookeeper-discovery - ${spring-cloud-zookeeper.version} true @@ -135,7 +128,6 @@ org.springframework.cloud spring-cloud-starter-consul-discovery - ${spring-cloud-consul.version} true 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 7b16b12b..94f3f223 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 @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud - spring-cloud-build - 2.1.3.RELEASE - + spring-cloud-alibaba-examples + com.alibaba.cloud + 2.1.1.BUILD-SNAPSHOT + ../pom.xml 4.0.0 @@ -26,79 +26,4 @@ spring-cloud-dubbo-servlet-gateway-sample - - 2.7.1 - 2.1.3.RELEASE - 2.1.3.RELEASE - 2.1.3.RELEASE - 2.1.3.RELEASE - 2.1.3.RELEASE - 4.0.1 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${project.version} - pom - import - - - - org.springframework.cloud - spring-cloud-netflix - ${spring-cloud-netflix.version} - pom - import - - - - org.springframework.cloud - spring-cloud-openfeign-dependencies - ${spring-cloud-openfeign.version} - pom - import - - - - org.apache.dubbo - dubbo-bom - ${dubbo.version} - pom - import - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - \ No newline at end of file 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 9e5ab0fb..d3d4d5f2 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 @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud - spring-cloud-build - 2.1.3.RELEASE - + com.alibaba.cloud + spring-cloud-alibaba-dubbo-examples + 2.1.1.BUILD-SNAPSHOT + ../pom.xml 4.0.0 @@ -15,19 +15,6 @@ Spring Cloud Dubbo Client Sample 2.1.1.BUILD-SNAPSHOT - - - - - org.springframework.cloud - spring-cloud-alibaba-dependencies - 0.9.0.RELEASE - pom - import - - - - @@ -49,13 +36,13 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-dubbo - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery 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 15bef9e8..627d6286 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 @@ -68,7 +68,6 @@ org.springframework.cloud spring-cloud-starter-zookeeper-discovery - ${spring-cloud-zookeeper.version} org.apache.zookeeper 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 b876fe4c..213dc8dd 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 @@ -59,7 +59,6 @@ org.springframework.cloud spring-cloud-starter-zookeeper-discovery - ${spring-cloud-zookeeper.version} org.apache.zookeeper @@ -137,6 +136,18 @@ + + + + org.apache.dubbo + dubbo-bom + ${dubbo.version} + pom + import + + + + 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 c6d7d7d5..3a31e6f6 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 @@ -58,7 +58,6 @@ org.springframework.cloud spring-cloud-starter-zookeeper-discovery - ${spring-cloud-zookeeper.version} org.apache.zookeeper 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 9e1103ad..64d9fa94 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 @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud - spring-cloud-build - 2.1.3.RELEASE - + com.alibaba.cloud + spring-cloud-alibaba-dubbo-examples + 2.1.1.BUILD-SNAPSHOT + ../pom.xml 4.0.0 @@ -16,19 +16,6 @@ Spring Cloud Dubbo Server Sample 2.1.1.BUILD-SNAPSHOT - - - - - org.springframework.cloud - spring-cloud-alibaba-dependencies - 0.9.0.RELEASE - pom - import - - - - @@ -46,13 +33,13 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-dubbo - org.springframework.cloud + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery