Merge pull request #2137 from ligangty/2.7.x

Chore: replace junit assertThat with hamcrest assertThat due to deprecated warning

Author: ligangty

addons/changelog/ftests/src/main/java/org/commonjava/indy/changelog/RepoChangelogStoreDisableTest.java

@@ -33,7 +33,7 @@
 import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 /**

addons/changelog/ftests/src/main/java/org/commonjava/indy/changelog/RepoChangelogStoreTest.java

@@ -33,7 +33,7 @@
 
 import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * This test ensure that each repo change will trigger a change log entry in cache.

addons/content-browse/ftests/src/main/java/org/commonjava/indy/content/browse/ftest/MetaListingRescheduleTimeoutTest.java

@@ -43,7 +43,7 @@
 import static org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor.MAVEN_PKG_KEY;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * This case test if the ".listing.txt" metadata re-schedule is working.

addons/content-browse/ftests/src/main/java/org/commonjava/indy/content/browse/ftest/StoreNPMThenListingDirTest.java

@@ -37,7 +37,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Verifies that the available packages are listed via browse api.

addons/content-browse/ftests/src/main/java/org/commonjava/indy/content/browse/ftest/StoreThenGetUnSuffixedDirAndDownloadTest.java

@@ -28,7 +28,7 @@
 import static org.commonjava.indy.model.core.StoreType.hosted;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Verifies that nothing happens to stored content when an implied directory listing is requested.

addons/content-browse/ftests/src/main/java/org/commonjava/indy/content/browse/ftest/StoreThenGetUnSuffixedDirAndDownloadViaGroupTest.java

@@ -28,7 +28,7 @@
 import static org.commonjava.indy.model.core.StoreType.hosted;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Verifies that nothing happens to stored content when an implied directory listing is requested.

addons/diagnostics/ftests/src/main/java/org/commonjava/indy/diags/ftest/DownloadDiagBundleTest.java

@@ -42,7 +42,7 @@
 import static org.commonjava.indy.client.core.util.UrlUtils.buildUrl;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Created by jdcasey on 1/11/17.

addons/dot-maven/common/src/test/java/org/commonjava/indy/dotmaven/util/NameUtilsTest.java

@@ -16,7 +16,7 @@
 package org.commonjava.indy.dotmaven.util;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 

addons/dot-maven/common/src/test/java/org/commonjava/indy/dotmaven/util/SettingsURIMatcherTest.java

@@ -16,7 +16,7 @@
 package org.commonjava.indy.dotmaven.util;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 

addons/dot-maven/ftests/src/main/java/org/commonjava/indy/dotmaven/settings/SettingsGeneratedForRemoteRepoTest.java

@@ -18,7 +18,7 @@
 import static org.apache.commons.io.IOUtils.closeQuietly;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.InputStream;