diff --git a/core/trino-main/pom.xml b/core/trino-main/pom.xml index 4cffbc67cce6..bdeb2b1c1c30 100644 --- a/core/trino-main/pom.xml +++ b/core/trino-main/pom.xml @@ -444,6 +444,12 @@ test + + org.apache.commons + commons-lang3 + test + + org.assertj assertj-guava diff --git a/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java b/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java index dd87d06c7821..1b30aaf949b8 100644 --- a/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java +++ b/core/trino-main/src/test/java/io/trino/operator/aggregation/listagg/TestListaggAggregationFunction.java @@ -22,7 +22,7 @@ import io.trino.spi.block.VariableWidthBlockBuilder; import io.trino.sql.analyzer.TypeSignatureProvider; import io.trino.sql.tree.QualifiedName; -import org.testcontainers.shaded.org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.annotations.Test; import java.util.List; diff --git a/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java b/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java index 397a096fdfc6..718b77c66119 100644 --- a/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java +++ b/core/trino-main/src/test/java/io/trino/sql/query/TestListagg.java @@ -15,11 +15,11 @@ import io.trino.spi.TrinoException; import io.trino.sql.parser.ParsingException; +import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.testcontainers.shaded.org.apache.commons.lang.StringUtils; import static io.trino.spi.StandardErrorCode.EXCEEDED_FUNCTION_MEMORY_LIMIT; import static io.trino.spi.block.PageBuilderStatus.DEFAULT_MAX_PAGE_SIZE_IN_BYTES; diff --git a/plugin/trino-accumulo/pom.xml b/plugin/trino-accumulo/pom.xml index c2773f67e960..d4f714fd3069 100644 --- a/plugin/trino-accumulo/pom.xml +++ b/plugin/trino-accumulo/pom.xml @@ -183,7 +183,6 @@ org.apache.commons commons-lang3 - 3.4 diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java index 3b8fcd6e10e0..81f0aef464bd 100644 --- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java +++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestingPhoenixServer.java @@ -19,7 +19,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; -import org.apache.phoenix.shaded.org.apache.zookeeper.server.ZooKeeperServer; +import org.apache.zookeeper.server.ZooKeeperServer; import javax.annotation.concurrent.GuardedBy; diff --git a/plugin/trino-pinot/pom.xml b/plugin/trino-pinot/pom.xml index 7920cb92a220..7e58d4983dbf 100755 --- a/plugin/trino-pinot/pom.xml +++ b/plugin/trino-pinot/pom.xml @@ -459,7 +459,6 @@ org.apache.commons commons-lang3 - 3.8 runtime diff --git a/pom.xml b/pom.xml index c1068008557a..d52da6b08467 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 126 + 127 io.trino @@ -1490,6 +1490,12 @@ 1.21 + + org.apache.commons + commons-lang3 + 3.12.0 + + org.apache.commons commons-math3