Skip to content

Avoid using org.testcontainers.shaded.** #1876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2025
Merged

Avoid using org.testcontainers.shaded.** #1876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,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" }
Copy link
Contributor

@singhpk234 singhpk234 Jun 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to add this in licence ?

Copy link
Contributor Author

@dimas-b dimas-b Jun 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think so: we use it only in test code; Awaitility is ALv2 and does not have a NOTICE... but happy to include in a follow-up PR (merging for now to unblock related work)... @jbonofre WDYT?

Copy link
Contributor

@singhpk234 singhpk234 Jun 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sg!

Copy link
Member

@snazy snazy Jun 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally speaking: only stuff that's distributed or "copied" into the source tree needs to be mentioned in license/notice.

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" }
Expand Down
1 change: 1 addition & 0 deletions integration-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ dependencies {
compileOnly("org.junit.jupiter:junit-jupiter-engine")
implementation(libs.assertj.core)
implementation(libs.mockito.core)
implementation(libs.awaitility)
}

copiedCodeChecks {
Expand Down
2 changes: 1 addition & 1 deletion ...s/src/main/java/org/apache/polaris/service/it/test/PolarisApplicationIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
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;
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/org/apache/polaris/service/it/test/PolarisManagementServiceIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
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;
Expand Down Expand Up @@ -80,13 +81,12 @@
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
Expand Down
2 changes: 1 addition & 1 deletion quarkus/admin/src/test/java/org/apache/polaris/admintool/el/EclipselinkPurgeCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...est/java/org/apache/polaris/admintool/relational/jdbc/RelationalJdbcPurgeCommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions quarkus/service/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion ...kus/service/src/test/java/org/apache/polaris/service/quarkus/metrics/MetricsTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
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;
Expand All @@ -43,7 +44,6 @@
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)
Expand Down
Loading