This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new c3ed2e7 DRILL-7943 Update Hamcrest to 2.2 (#2246)
c3ed2e7 is described below
commit c3ed2e7b681377b2765223865c08a4374a588987
Author: Martin Grigorov <[email protected]>
AuthorDate: Fri Jun 11 00:49:43 2021 +0300
DRILL-7943 Update Hamcrest to 2.2 (#2246)
Update Hamcrest testing library from 1.3 to 2.2.
Update all usages of org.junit.Assert.assertThat() to
org.hamcrest.MatcherAssert.assertThat()
---
.../drill/test/Drill2130CommonHamcrestConfigurationTest.java | 2 +-
.../test/Drill2130StorageHBaseHamcrestConfigurationTest.java | 2 +-
.../java/org/apache/drill/exec/hive/HiveTestUtilities.java | 2 +-
.../Drill2130StorageHiveCoreHamcrestConfigurationTest.java | 2 +-
exec/java-exec/pom.xml | 2 +-
.../src/test/java/org/apache/drill/TestFrameworkTest.java | 2 +-
.../src/test/java/org/apache/drill/TestSelectWithOption.java | 2 +-
.../java/org/apache/drill/TestUtf8SupportInQueryString.java | 2 +-
.../test/java/org/apache/drill/exec/TestPathSerialization.java | 2 +-
.../apache/drill/exec/client/DrillSqlLineApplicationTest.java | 2 +-
.../apache/drill/exec/fn/impl/testing/TestDateConversions.java | 2 +-
.../drill/exec/impersonation/TestImpersonationQueries.java | 2 +-
.../exec/physical/impl/join/TestHashJoinJPPDCorrectness.java | 2 +-
.../drill/exec/physical/impl/join/TestNestedLoopJoin.java | 2 +-
.../drill/exec/physical/impl/lateraljoin/TestLateralPlans.java | 2 +-
.../apache/drill/exec/planner/TestDirectoryExplorerUDFs.java | 2 +-
.../drill/exec/planner/sql/handlers/SetOptionHandlerTest.java | 2 +-
.../org/apache/drill/exec/server/rest/TestQueryWrapper.java | 2 +-
.../org/apache/drill/exec/server/rest/TestResponseHeaders.java | 2 +-
.../java/org/apache/drill/exec/sql/TestMetastoreCommands.java | 2 +-
.../org/apache/drill/exec/sql/TestSimpleCastFunctions.java | 2 +-
.../java/org/apache/drill/exec/store/TestTimedCallable.java | 2 +-
.../exec/test/Drill2130JavaExecHamcrestConfigurationTest.java | 2 +-
.../apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java | 2 +-
.../exec/vector/complex/writer/TestJsonEscapeAnyChar.java | 4 ++--
.../drill/exec/vector/complex/writer/TestJsonNanInf.java | 2 +-
.../src/test/java/org/apache/drill/test/BaseTestQuery.java | 2 +-
.../test/java/org/apache/drill/test/TestGracefulShutdown.java | 2 +-
exec/jdbc-all/pom.xml | 2 +-
.../test/java/org/apache/drill/jdbc/ConnectionInfoTest.java | 2 +-
.../src/test/java/org/apache/drill/jdbc/ConnectionTest.java | 2 +-
.../apache/drill/jdbc/ConnectionTransactionMethodsTest.java | 2 +-
.../org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java | 2 +-
.../test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java | 2 +-
.../test/java/org/apache/drill/jdbc/DrillResultSetTest.java | 2 +-
exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java | 2 +-
.../drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java | 2 +-
.../org/apache/drill/jdbc/LegacyPreparedStatementTest.java | 2 +-
.../org/apache/drill/jdbc/PreparedStatementMaxRowsTest.java | 2 +-
.../test/java/org/apache/drill/jdbc/PreparedStatementTest.java | 2 +-
.../apache/drill/jdbc/ResultSetGetMethodConversionsTest.java | 2 +-
.../test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java | 2 +-
.../test/java/org/apache/drill/jdbc/StatementMaxRowsTest.java | 2 +-
.../src/test/java/org/apache/drill/jdbc/StatementTest.java | 2 +-
.../apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java | 2 +-
.../drill/jdbc/proxy/TracingProxyDriverClassLoadingTest.java | 2 +-
.../org/apache/drill/jdbc/proxy/TracingProxyDriverTest.java | 2 +-
.../Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java | 2 +-
.../jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java | 2 +-
.../jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java | 2 +-
.../test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java | 2 +-
.../test/Drill2463GetNullsFailedWithAssertionsBugTest.java | 2 +-
.../jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java | 2 +-
.../drill/jdbc/test/TestExecutionExceptionsToClient.java | 2 +-
.../apache/drill/jdbc/test/TestInformationSchemaColumns.java | 2 +-
.../java/org/apache/drill/common/logical/data/OrderTest.java | 2 +-
.../components/tables/TestTablesMetadataTypeValidator.java | 2 +-
.../rdbms/components/tables/TestTablesMetadataMapper.java | 2 +-
.../rdbms/components/tables/TestTablesTransformer.java | 2 +-
.../apache/drill/metastore/rdbms/util/TestConverterUtil.java | 2 +-
pom.xml | 10 +++++-----
61 files changed, 66 insertions(+), 66 deletions(-)
diff --git
a/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
b/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
index ba5f567..a8481fe 100644
---
a/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
+++
b/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java
@@ -19,7 +19,7 @@ package org.apache.drill.test;
import org.junit.Test;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git
a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java
b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java
index f74f399..d43706b 100644
---
a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java
+++
b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java
@@ -18,7 +18,7 @@
package org.apache.drill.hbase.test;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import org.apache.drill.test.BaseTest;
diff --git
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java
index 537d0f4..2da8acb 100644
---
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java
+++
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java
@@ -35,7 +35,7 @@ import org.junit.AssumptionViolatedException;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assume.assumeThat;
public class HiveTestUtilities {
diff --git
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java
index 66037e0..b700699 100644
---
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java
+++
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java
@@ -20,7 +20,7 @@ package org.apache.drill.exec.test;
import org.apache.drill.test.BaseTest;
import org.junit.Test;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 47aaeda..79860d2 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
+ <artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java
b/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java
index 27da7e0..c1f4103 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java
@@ -20,7 +20,7 @@ package org.apache.drill;
import static org.apache.drill.test.TestBuilder.listOf;
import static org.apache.drill.test.TestBuilder.mapOf;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/TestSelectWithOption.java
b/exec/java-exec/src/test/java/org/apache/drill/TestSelectWithOption.java
index 69f689e..10bb0ec 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestSelectWithOption.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestSelectWithOption.java
@@ -20,7 +20,7 @@ package org.apache.drill;
import static java.lang.String.format;
import static org.apache.drill.test.TestBuilder.listOf;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.File;
import java.io.FileWriter;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java
b/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java
index 523b15b..dba577f 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import java.nio.charset.Charset;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TestUtf8SupportInQueryString extends BaseTestQuery {
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/TestPathSerialization.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/TestPathSerialization.java
index cb93565..fd697f5 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/TestPathSerialization.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/TestPathSerialization.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import java.io.IOException;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TestPathSerialization extends DrillTest {
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java
index f75e6df..2c31a85 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillSqlLineApplicationTest.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
public class DrillSqlLineApplicationTest extends BaseTest {
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java
index c820408..6600aeb 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java
@@ -33,7 +33,7 @@ import java.time.LocalDateTime;
import java.time.LocalTime;
import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
@Category({UnlikelyTest.class, SqlFunctionTest.class})
public class TestDateConversions extends BaseTestQuery {
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java
index 03f52c1..d149689 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java
@@ -37,7 +37,7 @@ import java.util.Map;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNull;
/**
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPDCorrectness.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPDCorrectness.java
index 042a081..38ff944 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPDCorrectness.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinJPPDCorrectness.java
@@ -27,7 +27,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.nio.file.Paths;
@Category(SqlTest.class)
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java
index fb41df5..9de6d72 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java
@@ -35,7 +35,7 @@ import java.util.Map;
import static junit.framework.TestCase.fail;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
@Category(OperatorTest.class)
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/lateraljoin/TestLateralPlans.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/lateraljoin/TestLateralPlans.java
index f94a983..b716aab 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/lateraljoin/TestLateralPlans.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/lateraljoin/TestLateralPlans.java
@@ -20,7 +20,7 @@ package org.apache.drill.exec.physical.impl.lateraljoin;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.nio.file.Paths;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java
index 21cb34f..b8cbb7c 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java
@@ -43,7 +43,7 @@ import
org.apache.drill.shaded.guava.com.google.common.collect.ImmutableList;
import org.apache.drill.shaded.guava.com.google.common.collect.Lists;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
@Category({SqlTest.class, PlannerTest.class})
public class TestDirectoryExplorerUDFs extends PlanTestBase {
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandlerTest.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandlerTest.java
index 3f2854d..c2536a8 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandlerTest.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandlerTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
@Category(SqlTest.class)
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestQueryWrapper.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestQueryWrapper.java
index 4c13310..6882126 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestQueryWrapper.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestQueryWrapper.java
@@ -20,7 +20,7 @@ package org.apache.drill.exec.server.rest;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import java.util.HashMap;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestResponseHeaders.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestResponseHeaders.java
index 2f1f8ec..c550a40 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestResponseHeaders.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestResponseHeaders.java
@@ -32,7 +32,7 @@ import static org.apache.drill.exec.ExecConstants.HTTP_ENABLE;
import static
org.apache.drill.exec.ExecConstants.HTTP_JETTY_SERVER_RESPONSE_HEADERS;
import static org.apache.drill.exec.ExecConstants.HTTP_PORT_HUNT;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TestResponseHeaders extends ClusterTest {
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java
index e12722e..3ca7aa6 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestMetastoreCommands.java
@@ -78,7 +78,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
index 482c2da..6267e30 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java
@@ -31,7 +31,7 @@ import java.util.Arrays;
import java.util.List;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
@Category(SqlTest.class)
public class TestSimpleCastFunctions extends BaseTestQuery {
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedCallable.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedCallable.java
index ea34230..b677aca 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedCallable.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedCallable.java
@@ -32,7 +32,7 @@ import java.util.List;
import static
org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE;
import static org.hamcrest.core.StringContains.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
/**
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java
index e3eba89..fb8a0df 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java
@@ -18,7 +18,7 @@
package org.apache.drill.exec.test;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import org.apache.drill.test.BaseTest;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java
index 454a944..0d9ec29 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/udf/dynamic/TestDynamicUDFSupport.java
@@ -57,7 +57,7 @@ import static
org.apache.drill.test.HadoopUtils.hadoopToJavaPath;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonEscapeAnyChar.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonEscapeAnyChar.java
index 323da27..314a328 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonEscapeAnyChar.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonEscapeAnyChar.java
@@ -29,7 +29,7 @@ import org.junit.Test;
import java.io.File;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TestJsonEscapeAnyChar extends ClusterTest {
@@ -84,4 +84,4 @@ public class TestJsonEscapeAnyChar extends ClusterTest {
public void teardown() throws Exception {
FileUtils.deleteQuietly(testFile);
}
-}
\ No newline at end of file
+}
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java
index 8b8581a..9b32b46 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java
@@ -20,7 +20,7 @@ package org.apache.drill.exec.vector.complex.writer;
import static org.apache.drill.test.TestBuilder.mapOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.io.File;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java
b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java
index 5dbf5c1..f5e8064 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java
@@ -21,7 +21,7 @@ import static
org.apache.drill.exec.util.StoragePluginTestUtils.ROOT_SCHEMA;
import static org.apache.drill.exec.util.StoragePluginTestUtils.TMP_SCHEMA;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import java.io.File;
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java
b/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java
index 5e27f75..c4edad2 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java
@@ -46,7 +46,7 @@ import java.util.Collection;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 1c146f7..4364879 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -263,7 +263,7 @@
-XX:+CMSClassUnloadingEnabled -ea</argLine>
<additionalClasspathElements>
<additionalClasspathElements>${settings.localRepository}/junit/junit/${junit.version}/junit-${junit.version}.jar</additionalClasspathElements>
-
<additionalClasspathElements>${settings.localRepository}/org/hamcrest/hamcrest-core/${hamcrest.core.version}/hamcrest-core-${hamcrest.core.version}.jar</additionalClasspathElements>
+
<additionalClasspathElements>${settings.localRepository}/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar</additionalClasspathElements>
<additionalClasspathElements>${project.build.directory}/test-classes/</additionalClasspathElements>
</additionalClasspathElements>
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
index c2a3ebd..6fefe05 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfoTest.java
@@ -34,7 +34,7 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Test for Drill's Properties in the JDBC URL connection string
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
index 3ce52d7..b9043cb 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import org.apache.drill.categories.JdbcTest;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
index 26eda3a..2d8acb4 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java
@@ -24,7 +24,7 @@ import static java.sql.Connection.TRANSACTION_REPEATABLE_READ;
import static java.sql.Connection.TRANSACTION_SERIALIZABLE;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.drill.categories.JdbcTest;
import org.apache.drill.test.BaseTest;
import org.junit.AfterClass;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
index fc0179a..464a90c 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataGetColumnsTest.java
@@ -24,7 +24,7 @@ import static
org.apache.drill.exec.util.StoragePluginTestUtils.DFS_TMP_SCHEMA;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
index 9ee39b3..6898a4b 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DatabaseMetaDataTest.java
@@ -25,7 +25,7 @@ import static java.sql.Connection.TRANSACTION_SERIALIZABLE;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import org.apache.calcite.avatica.util.Quoting;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
index 73f96e5..b797efc 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DrillResultSetTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
index 5fff673..14dacdf 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/DriverTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import java.io.IOException;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
index 068fd6b..cfa7e18 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyDatabaseMetaDataGetColumnsTest.java
@@ -18,7 +18,7 @@
package org.apache.drill.jdbc;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.sql.SQLException;
import java.sql.Types;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
index 193d2bc..06d604f 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/LegacyPreparedStatementTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.sql.Clob;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementMaxRowsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementMaxRowsTest.java
index dc0ddee..f33999e 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementMaxRowsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementMaxRowsTest.java
@@ -19,7 +19,7 @@ package org.apache.drill.jdbc;
import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.sql.Connection;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java
index 5d7daa0..f8ce2e2 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/PreparedStatementTest.java
@@ -29,7 +29,7 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java
index c7fd897..af6e1e4 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java
@@ -18,7 +18,7 @@
package org.apache.drill.jdbc;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import org.apache.drill.categories.JdbcTest;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java
index 87327f0..0f0fe53 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java
@@ -20,7 +20,7 @@ package org.apache.drill.jdbc;
import static org.apache.drill.exec.util.StoragePluginTestUtils.DFS_TMP_SCHEMA;
import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.math.BigDecimal;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementMaxRowsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementMaxRowsTest.java
index 2acf9fb..33d064c 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementMaxRowsTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementMaxRowsTest.java
@@ -18,7 +18,7 @@
package org.apache.drill.jdbc;
import static org.hamcrest.CoreMatchers.containsString;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java
index 6575404..de15b05 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java
@@ -19,7 +19,7 @@ package org.apache.drill.jdbc;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
import org.apache.drill.categories.JdbcTest;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java
index d10e28f..bc1d702 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java
@@ -33,7 +33,7 @@ import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.anyOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* Class-level unit test for {@link TypeConvertingSqlAccessor}.
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverClassLoadingTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverClassLoadingTest.java
index 0c524e7..6ddb393 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverClassLoadingTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverClassLoadingTest.java
@@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
// NOTE: Currently, must not inherit from anything that loads the Drill driver
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverTest.java
index 54dfd9c..b4b9b4e 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/proxy/TracingProxyDriverTest.java
@@ -45,7 +45,7 @@ import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
index 24bb2ff..8308414 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java
@@ -19,7 +19,7 @@ package org.apache.drill.jdbc.test;
import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java
index b1c32c6..1564f52 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java
@@ -22,7 +22,7 @@ import org.apache.drill.test.BaseTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
import static org.hamcrest.CoreMatchers.equalTo;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java
index 94ef471..8328b77 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java
@@ -19,7 +19,7 @@ package org.apache.drill.jdbc.test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java
index b71032c..f5723ef 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java
@@ -18,7 +18,7 @@
package org.apache.drill.jdbc.test;
import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java
index 3ad854d..d484691 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java
@@ -20,7 +20,7 @@ package org.apache.drill.jdbc.test;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.drill.categories.JdbcTest;
import org.junit.AfterClass;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java
index b868cf5..657c86d 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2489CallsAfterCloseThrowExceptionsTest.java
@@ -27,7 +27,7 @@ import org.slf4j.Logger;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.slf4j.LoggerFactory.getLogger;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestExecutionExceptionsToClient.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestExecutionExceptionsToClient.java
index bed81a1..3b9d164 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestExecutionExceptionsToClient.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestExecutionExceptionsToClient.java
@@ -22,7 +22,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import org.apache.drill.categories.JdbcTest;
diff --git
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
index c9b497a..76f2553 100644
---
a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
+++
b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestInformationSchemaColumns.java
@@ -22,7 +22,7 @@ import static java.sql.ResultSetMetaData.columnNullable;
import static org.apache.drill.exec.util.StoragePluginTestUtils.DFS_TMP_SCHEMA;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git
a/logical/src/test/java/org/apache/drill/common/logical/data/OrderTest.java
b/logical/src/test/java/org/apache/drill/common/logical/data/OrderTest.java
index 9bfda8b..ff5c026 100644
--- a/logical/src/test/java/org/apache/drill/common/logical/data/OrderTest.java
+++ b/logical/src/test/java/org/apache/drill/common/logical/data/OrderTest.java
@@ -17,7 +17,7 @@
*/
package org.apache.drill.common.logical.data;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import org.apache.drill.common.exceptions.DrillRuntimeException;
import org.apache.drill.common.expression.LogicalExpression;
diff --git
a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java
b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java
index 97f8ca6..b0f02ac 100644
---
a/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java
+++
b/metastore/metastore-api/src/test/java/org/apache/drill/metastore/components/tables/TestTablesMetadataTypeValidator.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
import java.util.Collections;
import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
@Category(MetastoreTest.class)
diff --git
a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesMetadataMapper.java
b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesMetadataMapper.java
index 56e24fb..7e87705 100644
---
a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesMetadataMapper.java
+++
b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesMetadataMapper.java
@@ -33,7 +33,7 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
public class TestTablesMetadataMapper extends RdbmsBaseTest {
diff --git
a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java
b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java
index 0245c30..c992655 100644
---
a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java
+++
b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/components/tables/TestTablesTransformer.java
@@ -40,7 +40,7 @@ import java.util.Set;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
public class TestTablesTransformer extends RdbmsBaseTest {
diff --git
a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java
b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java
index 0b599e0..1d4e072 100644
---
a/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java
+++
b/metastore/rdbms-metastore/src/test/java/org/apache/drill/metastore/rdbms/util/TestConverterUtil.java
@@ -29,7 +29,7 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/pom.xml b/pom.xml
index c7b1214..caf3a20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
<netty.tcnative.classifier />
<commons.io.version>2.7</commons.io.version>
<commons.collections.version>4.4</commons.collections.version>
- <hamcrest.core.version>1.3</hamcrest.core.version>
+ <hamcrest.version>2.2</hamcrest.version>
<curator.version>5.1.0</curator.version>
<wiremock.standalone.version>2.23.2</wiremock.standalone.version>
<jmockit.version>1.47</jmockit.version>
@@ -331,8 +331,8 @@
</dependency>
<additionalDependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>${hamcrest.core.version}</version>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
</additionalDependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -1278,8 +1278,8 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-core</artifactId>
- <version>${hamcrest.core.version}</version>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
