You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2022/01/06 08:02:40 UTC
[dubbo] branch 3.0 updated: add jdk17 profile (#9530)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new dd86898 add jdk17 profile (#9530)
dd86898 is described below
commit dd86898dad088ef4e5fc56972eb1465c48a939d1
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Jan 6 16:02:19 2022 +0800
add jdk17 profile (#9530)
---
dubbo-config/dubbo-config-spring/pom.xml | 7 ++++++-
dubbo-dependencies-bom/pom.xml | 4 ++--
.../dubbo-dependencies-zookeeper-curator5/pom.xml | 10 +++-------
.../dubbo-dependencies-zookeeper/pom.xml | 18 ++++--------------
dubbo-distribution/dubbo-bom/pom.xml | 2 ++
.../dubbo-remoting-zookeeper-curator5/pom.xml | 5 +++++
pom.xml | 10 ++++++++++
7 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
index 4c7656a..645c029 100644
--- a/dubbo-config/dubbo-config-spring/pom.xml
+++ b/dubbo-config/dubbo-config-spring/pom.xml
@@ -188,7 +188,12 @@
</exclusion>
</exclusions>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-remoting-zookeeper</artifactId>
+ <version>${project.parent.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper-curator5</artifactId>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index f5ed76d..34bc5e3 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -99,8 +99,8 @@
<httpclient_version>4.5.13</httpclient_version>
<httpcore_version>4.4.6</httpcore_version>
<fastjson_version>1.2.70</fastjson_version>
- <zookeeper_version>3.7.0</zookeeper_version>
- <curator_version>5.1.0</curator_version>
+ <zookeeper_version>3.4.13</zookeeper_version>
+ <curator_version>4.2.0</curator_version>
<curator_test_version>2.12.0</curator_test_version>
<jedis_version>3.6.0</jedis_version>
<consul_version>1.4.2</consul_version>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
index dc9e4d1..989be44 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper-curator5/pom.xml
@@ -34,19 +34,13 @@
<properties>
<revision>3.0.6-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
+ <curator_version>5.1.0</curator_version>
<zookeeper_version>3.7.0</zookeeper_version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId>
<version>${zookeeper_version}</version>
@@ -60,10 +54,12 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
+ <version>${curator_version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper_version}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index a9f29be..04acfda 100644
--- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
+++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -34,30 +34,20 @@
<properties>
<revision>3.0.6-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version>
+ <curator_version>4.2.0</curator_version>
+ <zookeeper_version>3.4.13</zookeeper_version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-bom</artifactId>
- <version>${project.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId>
- <version>4.2.0</version>
+ <version>${curator_version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.13</version>
+ <version>${zookeeper_version}</version>
</dependency>
</dependencies>
diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
index fc7e102..eb698c4 100644
--- a/dubbo-distribution/dubbo-bom/pom.xml
+++ b/dubbo-distribution/dubbo-bom/pom.xml
@@ -290,11 +290,13 @@
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
<version>${project.version}</version>
+ <type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml
index 0b8500f..6209329 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-zookeeper-curator5/pom.xml
@@ -29,6 +29,8 @@
<description>The zookeeper curator5 remoting module of dubbo project</description>
<properties>
<skip_maven_deploy>false</skip_maven_deploy>
+ <curator5_version>5.1.0</curator5_version>
+ <zookeeper_version>3.7.0</zookeeper_version>
</properties>
<dependencies>
@@ -45,14 +47,17 @@
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
+ <version>${curator5_version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId>
+ <version>${curator5_version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
+ <version>${zookeeper_version}</version>
</dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 3e75fb2..0bcf1e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,6 +256,16 @@
<doclint>none</doclint>
</properties>
</profile>
+ <profile>
+ <id>curator5</id>
+ <activation>
+ <jdk>[1.17,)</jdk>
+ </activation>
+ <properties>
+ <zookeeper_version>3.7.0</zookeeper_version>
+ <curator_version>5.1.0</curator_version>
+ </properties>
+ </profile>
<!-- jacoco: mvn validate -Pjacoco -->
<profile>
<id>jacoco</id>