Merge pull request #8041 from NotMyFault/revert-hamcrest

Revert hamcrest updates and related changes in 5db5ceb, 6d2f930, 6d2f930

core/pom.xml

@@ -482,7 +482,7 @@ THE SOFTWARE.
     </dependency-->
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
+      <artifactId>hamcrest-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci</groupId>
     <artifactId>jenkins</artifactId>
-    <version>1.99</version>
+    <version>1.98</version>
     <relativePath />
   </parent>
 

test/pom.xml

@@ -106,7 +106,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1994.vd69d1ecff273</version>
+      <version>1993.vdb_c571468e00</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -148,7 +148,7 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
+      <artifactId>hamcrest-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

test/src/test/java/jenkins/bugs/Jenkins64991Test.java

@@ -24,9 +24,9 @@
 
 package jenkins.bugs;
 
+import static org.hamcrest.CoreMatchers.containsStringIgnoringCase;
+import static org.hamcrest.CoreMatchers.endsWithIgnoringCase;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsStringIgnoringCase;
-import static org.hamcrest.Matchers.endsWithIgnoringCase;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;