From ae8fd9095a87ca3351a64d8a8022fbd18452bd64 Mon Sep 17 00:00:00 2001
From: Alexander Brandes <mc.cache@web.de>
Date: Tue, 23 May 2023 16:26:47 +0200
Subject: [PATCH 1/3] Revert "Bump jenkins from 1.98 to 1.99 (#8038)"

This reverts commit d68f3abd0b1319000b7b4841907809a169371595.
---
 core/pom.xml | 2 +-
 pom.xml      | 2 +-
 test/pom.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 9eee35ad9c..aee0017588 100644
--- a/core/pom.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index b829ff8636..7e1a5831aa 100644
--- a/pom.xml
+++ b/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>
 
diff --git a/test/pom.xml b/test/pom.xml
index d52fdb8e7d..70402b45c1 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -148,7 +148,7 @@ THE SOFTWARE.
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
+      <artifactId>hamcrest-core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

From 96240ee7007654a9d57c6c4a893fc12eac91e579 Mon Sep 17 00:00:00 2001
From: Alexander Brandes <mc.cache@web.de>
Date: Tue, 23 May 2023 16:26:58 +0200
Subject: [PATCH 2/3] Revert "Bump jenkins-test-harness from
 1993.vdb_c571468e00 to 1994.vd69d1ecff273 (#8037)"

This reverts commit 6d2f930e820389717222f4409f6fa166542e5bd5.
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 70402b45c1..c7a6e76358 100644
--- a/test/pom.xml
+++ b/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>

From 1e5ad10da900614bc2d6dbe121caba8451646b18 Mon Sep 17 00:00:00 2001
From: Alexander Brandes <mc.cache@web.de>
Date: Tue, 23 May 2023 16:28:14 +0200
Subject: [PATCH 3/3] Revert "Update hamcrest imports (#8040)"

This reverts commit 5db5cebb597d9f7b3417020d3d7742f0d62e1d88.
---
 test/src/test/java/jenkins/bugs/Jenkins64991Test.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/src/test/java/jenkins/bugs/Jenkins64991Test.java b/test/src/test/java/jenkins/bugs/Jenkins64991Test.java
index 3055fe800d..b1615b76b0 100644
--- a/test/src/test/java/jenkins/bugs/Jenkins64991Test.java
+++ b/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;