add jdk17 profile (#9530)

This commit is contained in:
ken.lj 2022-01-06 16:02:19 +08:00 committed by GitHub
parent 501b0625c9
commit dd86898dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 24 deletions

View File

@ -188,7 +188,12 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-remoting-zookeeper-curator5</artifactId> <artifactId>dubbo-remoting-zookeeper-curator5</artifactId>

View File

@ -99,8 +99,8 @@
<httpclient_version>4.5.13</httpclient_version> <httpclient_version>4.5.13</httpclient_version>
<httpcore_version>4.4.6</httpcore_version> <httpcore_version>4.4.6</httpcore_version>
<fastjson_version>1.2.70</fastjson_version> <fastjson_version>1.2.70</fastjson_version>
<zookeeper_version>3.7.0</zookeeper_version> <zookeeper_version>3.4.13</zookeeper_version>
<curator_version>5.1.0</curator_version> <curator_version>4.2.0</curator_version>
<curator_test_version>2.12.0</curator_test_version> <curator_test_version>2.12.0</curator_test_version>
<jedis_version>3.6.0</jedis_version> <jedis_version>3.6.0</jedis_version>
<consul_version>1.4.2</consul_version> <consul_version>1.4.2</consul_version>

View File

@ -34,18 +34,12 @@
<properties> <properties>
<revision>3.0.6-SNAPSHOT</revision> <revision>3.0.6-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version> <maven_flatten_version>1.1.0</maven_flatten_version>
<curator_version>5.1.0</curator_version>
<zookeeper_version>3.7.0</zookeeper_version> <zookeeper_version>3.7.0</zookeeper_version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
@ -60,10 +54,12 @@
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId> <artifactId>curator-x-discovery</artifactId>
<version>${curator_version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper_version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>

View File

@ -34,30 +34,20 @@
<properties> <properties>
<revision>3.0.6-SNAPSHOT</revision> <revision>3.0.6-SNAPSHOT</revision>
<maven_flatten_version>1.1.0</maven_flatten_version> <maven_flatten_version>1.1.0</maven_flatten_version>
<curator_version>4.2.0</curator_version>
<zookeeper_version>3.4.13</zookeeper_version>
</properties> </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> <dependencies>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-x-discovery</artifactId> <artifactId>curator-x-discovery</artifactId>
<version>4.2.0</version> <version>${curator_version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>3.4.13</version> <version>${zookeeper_version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

View File

@ -290,11 +290,13 @@
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper</artifactId> <artifactId>dubbo-dependencies-zookeeper</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>pom</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-dependencies-zookeeper-curator5</artifactId> <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>pom</type>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -29,6 +29,8 @@
<description>The zookeeper curator5 remoting module of dubbo project</description> <description>The zookeeper curator5 remoting module of dubbo project</description>
<properties> <properties>
<skip_maven_deploy>false</skip_maven_deploy> <skip_maven_deploy>false</skip_maven_deploy>
<curator5_version>5.1.0</curator5_version>
<zookeeper_version>3.7.0</zookeeper_version>
</properties> </properties>
<dependencies> <dependencies>
@ -45,14 +47,17 @@
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId> <artifactId>curator-framework</artifactId>
<version>${curator5_version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId> <artifactId>curator-recipes</artifactId>
<version>${curator5_version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper_version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

10
pom.xml
View File

@ -256,6 +256,16 @@
<doclint>none</doclint> <doclint>none</doclint>
</properties> </properties>
</profile> </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 --> <!-- jacoco: mvn validate -Pjacoco -->
<profile> <profile>
<id>jacoco</id> <id>jacoco</id>