diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index 4c7656a9c2..645c029f56 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -188,7 +188,12 @@ - + + org.apache.dubbo + dubbo-remoting-zookeeper + ${project.parent.version} + test + org.apache.dubbo dubbo-remoting-zookeeper-curator5 diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index f5ed76dcd1..34bc5e3688 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -99,8 +99,8 @@ 4.5.13 4.4.6 1.2.70 - 3.7.0 - 5.1.0 + 3.4.13 + 4.2.0 2.12.0 3.6.0 1.4.2 diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml index dc9e4d194a..989be442a8 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml @@ -34,18 +34,12 @@ 3.0.6-SNAPSHOT 1.1.0 + 5.1.0 3.7.0 - - org.apache.dubbo - dubbo-dependencies-bom - ${project.version} - pom - import - org.apache.zookeeper parent @@ -60,10 +54,12 @@ org.apache.curator curator-x-discovery + ${curator_version} org.apache.zookeeper zookeeper + ${zookeeper_version} io.netty diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index a9f29beaff..04acfdac06 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -34,30 +34,20 @@ 3.0.6-SNAPSHOT 1.1.0 + 4.2.0 + 3.4.13 - - - - org.apache.dubbo - dubbo-dependencies-bom - ${project.version} - pom - import - - - - org.apache.curator curator-x-discovery - 4.2.0 + ${curator_version} org.apache.zookeeper zookeeper - 3.4.13 + ${zookeeper_version} diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml index fc7e1028a1..eb698c4174 100644 --- a/dubbo-distribution/dubbo-bom/pom.xml +++ b/dubbo-distribution/dubbo-bom/pom.xml @@ -290,11 +290,13 @@ org.apache.dubbo dubbo-dependencies-zookeeper ${project.version} + pom org.apache.dubbo dubbo-dependencies-zookeeper-curator5 ${project.version} + pom diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml index 0b8500fa8b..6209329bb5 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml @@ -29,6 +29,8 @@ The zookeeper curator5 remoting module of dubbo project false + 5.1.0 + 3.7.0 @@ -45,14 +47,17 @@ org.apache.curator curator-framework + ${curator5_version} org.apache.curator curator-recipes + ${curator5_version} org.apache.zookeeper zookeeper + ${zookeeper_version} diff --git a/pom.xml b/pom.xml index 3e75fb20ed..0bcf1e8dff 100644 --- a/pom.xml +++ b/pom.xml @@ -256,6 +256,16 @@ none + + curator5 + + [1.17,) + + + 3.7.0 + 5.1.0 + + jacoco