This is an automated email from the ASF dual-hosted git repository. yufei pushed a commit to branch release/1.0.x in repository https://gitbox.apache.org/repos/asf/polaris.git
commit 23f3e7d0e6b37475f73a607cbcb0c426e42ec4a2 Author: Dmitri Bourlatchkov <[email protected]> AuthorDate: Thu Jun 12 20:29:00 2025 -0400 Avoid using org.testcontainers.shaded.** (#1876) --- gradle/libs.versions.toml | 1 + integration-tests/build.gradle.kts | 1 + .../polaris/service/it/test/PolarisApplicationIntegrationTest.java | 2 +- .../service/it/test/PolarisManagementServiceIntegrationTest.java | 4 ++-- .../org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java | 2 +- .../admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java | 2 +- quarkus/service/build.gradle.kts | 1 + .../org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java | 2 +- 8 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d93414033..0c7c8de63 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -41,6 +41,7 @@ antlr4-runtime = { module = "org.antlr:antlr4-runtime", version.strictly = "4.9. assertj-core = { module = "org.assertj:assertj-core", version = "3.27.3" } auth0-jwt = { module = "com.auth0:java-jwt", version = "4.5.0" } awssdk-bom = { module = "software.amazon.awssdk:bom", version = "2.31.59" } +awaitility = { module = "org.awaitility:awaitility", version = "4.3.0" } azuresdk-bom = { module = "com.azure:azure-sdk-bom", version = "1.2.35" } caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.2.1" } commons-codec1 = { module = "commons-codec:commons-codec", version = "1.18.0" } diff --git a/integration-tests/build.gradle.kts b/integration-tests/build.gradle.kts index 2ef897d13..6836ff89b 100644 --- a/integration-tests/build.gradle.kts +++ b/integration-tests/build.gradle.kts @@ -67,6 +67,7 @@ dependencies { compileOnly("org.junit.jupiter:junit-jupiter-engine") implementation(libs.assertj.core) implementation(libs.mockito.core) + implementation(libs.awaitility) } copiedCodeChecks { diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisApplicationIntegrationTest.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisApplicationIntegrationTest.java index ac1584254..efa2441a1 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisApplicationIntegrationTest.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisApplicationIntegrationTest.java @@ -21,7 +21,7 @@ package org.apache.polaris.service.it.test; import static org.apache.polaris.service.it.env.PolarisClient.polarisClient; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.testcontainers.shaded.org.awaitility.Awaitility.await; +import static org.awaitility.Awaitility.await; import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.client.Entity; diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java index d0f18bf5a..b10c27c1a 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java @@ -30,6 +30,7 @@ import com.auth0.jwt.algorithms.Algorithm; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.collect.ImmutableMap; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Response; import java.io.IOException; @@ -80,13 +81,12 @@ import org.apache.polaris.service.it.env.PolarisApiEndpoints; import org.apache.polaris.service.it.env.PolarisClient; import org.apache.polaris.service.it.ext.PolarisIntegrationTestExtension; import org.assertj.core.api.InstanceOfAssertFactories; +import org.awaitility.Awaitility; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; -import org.testcontainers.shaded.org.awaitility.Awaitility; /** * @implSpec @implSpec This test expects the server to be configured with the following features diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java b/quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java index b80287cd0..395d3211a 100644 --- a/quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java +++ b/quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java @@ -18,10 +18,10 @@ */ package org.apache.polaris.admintool.el; +import com.google.common.collect.ImmutableMap; import io.quarkus.test.junit.TestProfile; import java.util.Map; import org.apache.polaris.admintool.PurgeCommandTestBase; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; @TestProfile(EclipselinkPurgeCommandTest.Profile.class) class EclipselinkPurgeCommandTest extends PurgeCommandTestBase { diff --git a/quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java b/quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java index 43163f531..096708643 100644 --- a/quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java +++ b/quarkus/admin/src/test/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java @@ -18,10 +18,10 @@ */ package org.apache.polaris.admintool.relational.jdbc; +import com.google.common.collect.ImmutableMap; import io.quarkus.test.junit.TestProfile; import java.util.Map; import org.apache.polaris.admintool.PurgeCommandTestBase; -import org.testcontainers.shaded.com.google.common.collect.ImmutableMap; @TestProfile(RelationalJdbcPurgeCommandTest.Profile.class) public class RelationalJdbcPurgeCommandTest extends PurgeCommandTestBase { diff --git a/quarkus/service/build.gradle.kts b/quarkus/service/build.gradle.kts index 01af01d3c..9cfc49e5b 100644 --- a/quarkus/service/build.gradle.kts +++ b/quarkus/service/build.gradle.kts @@ -126,6 +126,7 @@ dependencies { testImplementation(project(":polaris-quarkus-test-commons")) testImplementation("io.quarkus:quarkus-junit5") + implementation(libs.awaitility) testImplementation(platform(libs.testcontainers.bom)) testImplementation("org.testcontainers:testcontainers") testImplementation("org.testcontainers:postgresql") diff --git a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java index 4932a831c..45c8a33ea 100644 --- a/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java +++ b/quarkus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java @@ -33,6 +33,7 @@ import org.apache.polaris.service.quarkus.test.PolarisIntegrationTestHelper; import org.apache.polaris.service.quarkus.test.TestEnvironment; import org.apache.polaris.service.quarkus.test.TestEnvironmentExtension; import org.apache.polaris.service.quarkus.test.TestMetricsUtil; +import org.awaitility.Awaitility; import org.hawkular.agent.prometheus.types.MetricFamily; import org.hawkular.agent.prometheus.types.Summary; import org.junit.jupiter.api.Assertions; @@ -43,7 +44,6 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.testcontainers.shaded.org.awaitility.Awaitility; @TestInstance(TestInstance.Lifecycle.PER_CLASS) @ExtendWith(TestEnvironmentExtension.class)
