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 2d982639eaa Use Awaitility instead of test container shaded Awaitility
(#36220)
2d982639eaa is described below
commit 2d982639eaafee861cd48cffe0cbba81889f1c98
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Aug 9 10:13:36 2025 +0800
Use Awaitility instead of test container shaded Awaitility (#36220)
---
.../test/e2e/agent/engine/env/AgentE2ETestEnvironment.java | 2 +-
test/e2e/env/pom.xml | 5 +++++
.../shardingsphere/test/e2e/env/container/atomic/ITContainers.java | 4 ++--
.../test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java | 2 +-
.../test/e2e/data/pipeline/cases/PipelineContainerComposer.java | 2 +-
.../shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java | 2 +-
.../cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java | 2 +-
.../cases/migration/general/PostgreSQLToMySQLMigrationE2EIT.java | 2 +-
.../cases/alterresource/SwitchingTransactionRuleTestCase.java | 2 +-
.../transaction/cases/classictransfer/ClassicTransferTestCase.java | 2 +-
.../test/e2e/transaction/engine/base/TransactionBaseE2EIT.java | 2 +-
test/e2e/sql/pom.xml | 5 +++++
.../org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java | 6 +++---
.../org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java | 6 +++---
.../org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java | 6 +++---
.../org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java | 6 +++---
.../org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java | 6 +++---
17 files changed, 36 insertions(+), 26 deletions(-)
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
index 73527ba807b..9dc0f46696c 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
@@ -40,8 +40,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.Govern
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
+import org.awaitility.Awaitility;
import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.sql.SQLException;
import java.time.Duration;
diff --git a/test/e2e/env/pom.xml b/test/e2e/env/pom.xml
index 787bf567582..a9810e4acea 100644
--- a/test/e2e/env/pom.xml
+++ b/test/e2e/env/pom.xml
@@ -43,6 +43,11 @@
<artifactId>HikariCP</artifactId>
<scope>compile</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
index 7d9dff61705..daecf3d0487 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/ITContainers.java
@@ -19,15 +19,15 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.NativeStorageContainer;
+import org.awaitility.Awaitility;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.lifecycle.Startable;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.util.Collection;
import java.util.Collections;
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
index a989341858a..24ce35443f4 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.e2e.env.container.wait;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.awaitility.Awaitility;
import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.sql.Connection;
import java.util.concurrent.Callable;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
index 9081cac2730..6221b8a1f43 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
@@ -52,7 +52,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageConta
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import javax.sql.DataSource;
import javax.xml.bind.JAXB;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
index 0e024bec57a..f581b400bd8 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
@@ -51,10 +51,10 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
index ff7ab4d1d55..8396586ad0a 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
@@ -34,10 +34,10 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLToMySQLMigrationE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLToMySQLMigrationE2EIT.java
index d57f6fa5001..a1f1a4b7264 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLToMySQLMigrationE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLToMySQLMigrationE2EIT.java
@@ -34,11 +34,11 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ESettings.PipelineE2EDatabaseSettings;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.testcontainers.containers.PostgreSQLContainer;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.math.BigDecimal;
import java.sql.Connection;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
index a7ace88fa30..653e5a338ff 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/alterresource/SwitchingTransactionRuleTestCase.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTes
import
org.apache.shardingsphere.test.e2e.transaction.engine.command.CommonSQLCommand;
import
org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import org.apache.shardingsphere.transaction.api.TransactionType;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java
index 2d5a275969a..bbe428459c1 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/classictransfer/ClassicTransferTestCase.java
@@ -23,7 +23,7 @@ import lombok.SneakyThrows;
import
org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionContainerComposer;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
+import org.awaitility.Awaitility;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index dc6b5c5cc61..c5bf5d5be52 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -37,6 +37,7 @@ import
org.apache.shardingsphere.test.e2e.transaction.framework.container.compos
import
org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
import
org.apache.shardingsphere.test.e2e.transaction.util.TestCaseClassScanner;
import org.apache.shardingsphere.transaction.api.TransactionType;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -44,7 +45,6 @@ import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import org.junit.jupiter.params.support.ParameterDeclarations;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import javax.sql.DataSource;
import javax.xml.bind.JAXB;
diff --git a/test/e2e/sql/pom.xml b/test/e2e/sql/pom.xml
index f087a373672..370e63895e6 100644
--- a/test/e2e/sql/pom.xml
+++ b/test/e2e/sql/pom.xml
@@ -55,5 +55,10 @@
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
index 07ced9f4845..35d91a5ad13 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/ral/RALE2EIT.java
@@ -22,18 +22,18 @@ import lombok.Setter;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.sql.Connection;
import java.sql.PreparedStatement;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
index f72cae15432..2b884d58ae1 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/distsql/rdl/RDLE2EIT.java
@@ -22,18 +22,18 @@ import lombok.Setter;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.sql.Connection;
import java.sql.PreparedStatement;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
index d1499bd56f2..a99fe801dec 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/ddl/DDLE2EIT.java
@@ -24,19 +24,19 @@ import
org.apache.shardingsphere.infra.expr.core.InlineExpressionParserFactory;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetIndex;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import org.apache.shardingsphere.test.e2e.framework.SQLE2EITArgumentsProvider;
import org.apache.shardingsphere.test.e2e.framework.SQLE2EITSettings;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import
org.apache.shardingsphere.test.e2e.framework.param.array.E2ETestParameterFactory;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import org.apache.shardingsphere.test.e2e.framework.type.SQLCommandType;
import org.apache.shardingsphere.test.e2e.framework.type.SQLExecuteType;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import org.awaitility.Awaitility;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
index 1f16bfdb64a..aef3a9d1c7a 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dml/BaseDMLE2EIT.java
@@ -32,9 +32,7 @@ import
org.apache.shardingsphere.test.e2e.cases.dataset.DataSetLoader;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
@@ -44,7 +42,9 @@ import
org.apache.shardingsphere.test.e2e.framework.database.DatabaseAssertionMe
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.CaseTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import org.awaitility.Awaitility;
import javax.sql.DataSource;
import javax.xml.bind.JAXBException;
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
index 115b217faab..31f7b653624 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/it/sql/dql/BaseDQLE2EIT.java
@@ -24,14 +24,14 @@ import
org.apache.shardingsphere.infra.util.datetime.DateTimeFormatterFactory;
import org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetColumn;
import
org.apache.shardingsphere.test.e2e.cases.dataset.metadata.DataSetMetaData;
import org.apache.shardingsphere.test.e2e.cases.dataset.row.DataSetRow;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
import org.apache.shardingsphere.test.e2e.env.DataSetEnvironmentManager;
-import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
import org.apache.shardingsphere.test.e2e.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
-import org.testcontainers.shaded.org.awaitility.Awaitility;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EIT;
+import org.apache.shardingsphere.test.e2e.it.SQLE2EITContext;
+import org.awaitility.Awaitility;
import javax.sql.DataSource;
import javax.xml.bind.JAXBException;
