diff --git a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandler.java b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandler.java index d69d51b8247e..92697a4649dd 100644 --- a/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandler.java +++ b/iceberg/iceberg-handler/src/test/java/org/apache/iceberg/mr/hive/TestHiveIcebergStorageHandler.java @@ -33,9 +33,9 @@ import static java.util.Arrays.asList; import static java.util.Collections.singletonList; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) diff --git a/itests/hive-unit-hadoop2/pom.xml b/itests/hive-unit-hadoop2/pom.xml index 53d8f52f8bf1..0f4ca2d891b7 100644 --- a/itests/hive-unit-hadoop2/pom.xml +++ b/itests/hive-unit-hadoop2/pom.xml @@ -148,6 +148,12 @@ + + org.mockito + mockito-core + ${mockito-core.version} + test + org.apache.hadoop diff --git a/itests/hive-unit/pom.xml b/itests/hive-unit/pom.xml index 29ece2167223..09d4f5712f90 100644 --- a/itests/hive-unit/pom.xml +++ b/itests/hive-unit/pom.xml @@ -208,6 +208,11 @@ junit test + + org.junit.jupiter + junit-jupiter-engine + test + org.apache.hadoop hadoop-hdfs diff --git a/itests/qtest-iceberg/pom.xml b/itests/qtest-iceberg/pom.xml index 0a741d923766..1a7ad8be74ac 100644 --- a/itests/qtest-iceberg/pom.xml +++ b/itests/qtest-iceberg/pom.xml @@ -423,6 +423,12 @@ postgresql true + + org.mockito + mockito-core + ${mockito-core.version} + test + diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index e1fc7ce6b35a..30a6864cef56 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -138,6 +138,12 @@ junit test + + org.mockito + mockito-core + ${mockito-core.version} + test + com.sun.jersey jersey-servlet diff --git a/pom.xml b/pom.xml index b02ae3da0eb9..e72e11f30069 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,7 @@ 12.0.0 1.12.0 1.11.1 - 1.64 + 1.68 1.25.0 5.2.8 5.2.10 @@ -140,7 +140,7 @@ 22.0 2.4.21 2.2.220 - 3.3.1 + 3.3.6 ${basedir}/${hive.path.to.root}/testutils/hadoop 1.3 2.0.0-alpha4 @@ -158,7 +158,7 @@ 3.1.0 5.5.1 1.5.4 - 9.4.40.v20210413 + 9.4.45.v20220203 1.19 2.14.6 2.0.2 diff --git a/serde/pom.xml b/serde/pom.xml index 5a373a164781..4d391bfcf56f 100644 --- a/serde/pom.xml +++ b/serde/pom.xml @@ -243,6 +243,12 @@ compile ${esri.version} + + org.mockito + mockito-core + ${mockito-core.version} + test + diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java index aaabd69e5994..c0f47a272577 100644 --- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/security/TestTokenStoreDelegationTokenSecretManager.java @@ -111,7 +111,7 @@ private DelegationTokenIdentifier getID(String tokenStr) throws IOException { Thread.sleep(1000); SecretManager.InvalidToken ex = Assert.assertThrows(SecretManager.InvalidToken.class, () -> mgr.verifyDelegationToken(tokenStr)); - Assert.assertTrue(ex.getMessage().contains("is expired")); + Assert.assertTrue(ex.getMessage(), ex.getMessage().contains("has expired")); } finally { mgr.stopThreads(); } diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml index 29b59b5931e4..5fde3d785137 100644 --- a/standalone-metastore/pom.xml +++ b/standalone-metastore/pom.xml @@ -77,7 +77,7 @@ 3.1.0 22.0 - 3.3.1 + 3.3.6 4.0.3 2.13.5 3.3 diff --git a/storage-api/pom.xml b/storage-api/pom.xml index 5e4d9f235183..5310a980b452 100644 --- a/storage-api/pom.xml +++ b/storage-api/pom.xml @@ -29,7 +29,7 @@ 1.8 1.1.3 22.0 - 3.3.1 + 3.3.6 4.13.2 5.6.3 5.6.3