This is an automated email from the ASF dual-hosted git repository. zhangliang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push: new 86e20c86248 Refactor usage of awaitility (#36227) 86e20c86248 is described below commit 86e20c8624839b6f921eb3354773616943d10c79 Author: Liang Zhang <zhangli...@apache.org> AuthorDate: Sat Aug 9 22:44:26 2025 +0800 Refactor usage of awaitility (#36227) --- agent/plugins/core/pom.xml | 5 ----- agent/plugins/metrics/core/pom.xml | 5 ----- features/sharding/core/pom.xml | 5 ----- infra/algorithm/type/key-generator/type/snowflake/pom.xml | 5 ----- infra/common/pom.xml | 5 ----- infra/data-source-pool/core/pom.xml | 4 ---- infra/executor/pom.xml | 4 ---- mode/core/pom.xml | 5 ----- mode/type/cluster/core/pom.xml | 5 ----- pom.xml | 5 +++++ proxy/backend/core/pom.xml | 4 ---- test/e2e/agent/pom.xml | 7 ------- test/e2e/env/pom.xml | 5 ----- test/e2e/operation/pipeline/pom.xml | 5 ----- test/e2e/operation/showprocesslist/pom.xml | 5 ----- test/e2e/operation/transaction/pom.xml | 4 ---- test/e2e/sql/pom.xml | 5 ----- test/native/pom.xml | 5 ----- 18 files changed, 5 insertions(+), 83 deletions(-) diff --git a/agent/plugins/core/pom.xml b/agent/plugins/core/pom.xml index 5738cd35690..9fe17193b1e 100644 --- a/agent/plugins/core/pom.xml +++ b/agent/plugins/core/pom.xml @@ -37,11 +37,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> <build> diff --git a/agent/plugins/metrics/core/pom.xml b/agent/plugins/metrics/core/pom.xml index 676c4f53551..16fdf286d69 100644 --- a/agent/plugins/metrics/core/pom.xml +++ b/agent/plugins/metrics/core/pom.xml @@ -98,11 +98,6 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> <build> diff --git a/features/sharding/core/pom.xml b/features/sharding/core/pom.xml index 60a7a4b3df1..eacbd21ea8c 100644 --- a/features/sharding/core/pom.xml +++ b/features/sharding/core/pom.xml @@ -133,10 +133,5 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/infra/algorithm/type/key-generator/type/snowflake/pom.xml b/infra/algorithm/type/key-generator/type/snowflake/pom.xml index 94b608b4ec3..d62610d55b1 100644 --- a/infra/algorithm/type/key-generator/type/snowflake/pom.xml +++ b/infra/algorithm/type/key-generator/type/snowflake/pom.xml @@ -39,10 +39,5 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/infra/common/pom.xml b/infra/common/pom.xml index 0b33f9ba8c0..28cf16d3d18 100644 --- a/infra/common/pom.xml +++ b/infra/common/pom.xml @@ -95,11 +95,6 @@ <groupId>com.alibaba</groupId> <artifactId>transmittable-thread-local</artifactId> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> <build> diff --git a/infra/data-source-pool/core/pom.xml b/infra/data-source-pool/core/pom.xml index 77a742a1219..c056ad87618 100644 --- a/infra/data-source-pool/core/pom.xml +++ b/infra/data-source-pool/core/pom.xml @@ -50,9 +50,5 @@ <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/infra/executor/pom.xml b/infra/executor/pom.xml index ef55ccd8016..9740d3ee0e0 100644 --- a/infra/executor/pom.xml +++ b/infra/executor/pom.xml @@ -64,10 +64,6 @@ <artifactId>transmittable-thread-local</artifactId> </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> diff --git a/mode/core/pom.xml b/mode/core/pom.xml index f0243ba637e..1e5aa51df56 100644 --- a/mode/core/pom.xml +++ b/mode/core/pom.xml @@ -56,10 +56,5 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/mode/type/cluster/core/pom.xml b/mode/type/cluster/core/pom.xml index 93b78d9d427..ee65e7b53bd 100644 --- a/mode/type/cluster/core/pom.xml +++ b/mode/type/cluster/core/pom.xml @@ -66,10 +66,5 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/pom.xml b/pom.xml index 8be4ebefd61..35c8852197c 100644 --- a/pom.xml +++ b/pom.xml @@ -672,6 +672,11 @@ <artifactId>mockito-junit-jupiter</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.awaitility</groupId> + <artifactId>awaitility</artifactId> + <scope>test</scope> + </dependency> <dependency> <groupId>com.cedarsoftware</groupId> diff --git a/proxy/backend/core/pom.xml b/proxy/backend/core/pom.xml index 1607c6c0a30..67a7bc866f9 100644 --- a/proxy/backend/core/pom.xml +++ b/proxy/backend/core/pom.xml @@ -212,9 +212,5 @@ <artifactId>HikariCP</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/test/e2e/agent/pom.xml b/test/e2e/agent/pom.xml index 0b6dcd84537..ded97f8fe78 100644 --- a/test/e2e/agent/pom.xml +++ b/test/e2e/agent/pom.xml @@ -37,11 +37,4 @@ <maven.deploy.skip>true</maven.deploy.skip> <docker.proxy.distribution.name>apache-shardingsphere-${project.version}-shardingsphere-proxy-bin</docker.proxy.distribution.name> </properties> - - <dependencies> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - </dependencies> </project> diff --git a/test/e2e/env/pom.xml b/test/e2e/env/pom.xml index a9810e4acea..787bf567582 100644 --- a/test/e2e/env/pom.xml +++ b/test/e2e/env/pom.xml @@ -43,11 +43,6 @@ <artifactId>HikariCP</artifactId> <scope>compile</scope> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> <build> diff --git a/test/e2e/operation/pipeline/pom.xml b/test/e2e/operation/pipeline/pom.xml index 6762eaded49..46bb149dbd4 100644 --- a/test/e2e/operation/pipeline/pom.xml +++ b/test/e2e/operation/pipeline/pom.xml @@ -160,11 +160,6 @@ <type>test-jar</type> </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> - <dependency> <groupId>com.mysql</groupId> <artifactId>mysql-connector-j</artifactId> diff --git a/test/e2e/operation/showprocesslist/pom.xml b/test/e2e/operation/showprocesslist/pom.xml index 132bac0d3e9..d4e8dfe8a16 100644 --- a/test/e2e/operation/showprocesslist/pom.xml +++ b/test/e2e/operation/showprocesslist/pom.xml @@ -49,10 +49,5 @@ <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/test/e2e/operation/transaction/pom.xml b/test/e2e/operation/transaction/pom.xml index 112d0e7805d..645766ead5b 100644 --- a/test/e2e/operation/transaction/pom.xml +++ b/test/e2e/operation/transaction/pom.xml @@ -153,9 +153,5 @@ <groupId>org.opengauss</groupId> <artifactId>opengauss-jdbc</artifactId> </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/test/e2e/sql/pom.xml b/test/e2e/sql/pom.xml index 370e63895e6..f087a373672 100644 --- a/test/e2e/sql/pom.xml +++ b/test/e2e/sql/pom.xml @@ -55,10 +55,5 @@ <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> </dependency> - - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - </dependency> </dependencies> </project> diff --git a/test/native/pom.xml b/test/native/pom.xml index 48ee933f758..cd6411336bb 100644 --- a/test/native/pom.xml +++ b/test/native/pom.xml @@ -172,11 +172,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.awaitility</groupId> - <artifactId>awaitility</artifactId> - <scope>test</scope> - </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>junit-jupiter</artifactId>