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/13 06:57:12 UTC
[dubbo] branch 3.0 updated: fix potential maven profile jdk issue working with IDE issue
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 be900d2 fix potential maven profile jdk issue working with IDE issue
new 07acc66 Merge remote-tracking branch 'origin/3.0' into 3.0
be900d2 is described below
commit be900d20bd995edcbbff047c5f5bdda09e3da802
Author: ken.lj <ke...@gmail.com>
AuthorDate: Thu Jan 13 14:55:20 2022 +0800
fix potential maven profile jdk issue working with IDE issue
---
dubbo-dependencies-bom/pom.xml | 2 +-
dubbo-distribution/dubbo-bom/pom.xml | 6 ------
dubbo-test/dubbo-test-check/pom.xml | 12 +++++-------
3 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 32c1dc5..dbf6885 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -761,7 +761,7 @@
<profile>
<id>curator5</id>
<activation>
- <jdk>[1.17,)</jdk>
+ <jdk>1.17</jdk>
</activation>
<properties>
<zookeeper_version>3.7.0</zookeeper_version>
diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
index d885d44..b4e4ee0 100644
--- a/dubbo-distribution/dubbo-bom/pom.xml
+++ b/dubbo-distribution/dubbo-bom/pom.xml
@@ -287,12 +287,6 @@
<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-test/dubbo-test-check/pom.xml b/dubbo-test/dubbo-test-check/pom.xml
index ff78b0c..49414f7 100644
--- a/dubbo-test/dubbo-test-check/pom.xml
+++ b/dubbo-test/dubbo-test-check/pom.xml
@@ -33,8 +33,7 @@
<maven.compiler.target>8</maven.compiler.target>
<skip_maven_deploy>true</skip_maven_deploy>
<curator.test.version>4.2.0</curator.test.version>
- <zookeeper.version>3.4.13</zookeeper.version>
- <curator5.version>4.2.0</curator5.version>
+ <zookeeper.test.version>3.4.13</zookeeper.test.version>
<commons.compress.version>1.20</commons.compress.version>
<junit.platform.launcher.version>1.6.2</junit.platform.launcher.version>
<commons.exec.version>1.3</commons.exec.version>
@@ -58,12 +57,12 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>${zookeeper.version}</version>
+ <version>${zookeeper.test.version}</version>
</dependency>
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
- <version>${curator5.version}</version>
+ <version>${curator.test.version}</version>
</dependency>
<!-- tar.gz -->
<dependency>
@@ -89,12 +88,11 @@
<profile>
<id>curator5</id>
<activation>
- <jdk>[1.17,)</jdk>
+ <jdk>1.17</jdk>
</activation>
<properties>
<curator.test.version>5.1.0</curator.test.version>
- <zookeeper.version>3.6.0</zookeeper.version>
- <curator5.version>5.1.0</curator5.version>
+ <zookeeper.test.version>3.6.0</zookeeper.test.version>
</properties>
</profile>
</profiles>