From cb82f5b911a21f489edda7e5851b2eb0fb07896a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 09:36:29 -0700
Subject: [PATCH 1/2] Bump org.jenkins-ci.main:jenkins-test-harness from
 2193.v71b_f09ec6d46 to 2199.v5c2ef8ce998f (#9250)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 test/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pom.xml b/test/pom.xml
index 6ec4bd2fbd45c..3f8fc17741e31 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -142,7 +142,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>2193.v71b_f09ec6d46</version>
+      <version>2199.v5c2ef8ce998f</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From 0a5aa0e0f85f2e031b85a7c7d223d59ee4d701ef Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 9 May 2024 18:37:19 +0200
Subject: [PATCH 2/2] remove some Java 8 related parts in war pom (#9249)

Signed-off-by: Olivier Lamy <olamy@apache.org>
---
 war/pom.xml | 56 -----------------------------------------------------
 1 file changed, 56 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index 3db5f853d2d58..c1ad8601c0eb3 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -136,62 +136,6 @@ THE SOFTWARE.
   <build>
     <finalName>jenkins</finalName>
     <plugins>
-      <!-- TODO When Java 8 usage declines to a terminal level, this can be deleted. -->
-      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>display-info</id>
-            <configuration>
-              <rules>
-                <requireJavaVersion>
-                  <version>1.8</version>
-                </requireJavaVersion>
-                <enforceBytecodeVersion>
-                  <maxJdkVersion>1.8</maxJdkVersion>
-                  <excludes>
-                    <exclude>com.infradna.tool:bridge-method-annotation</exclude>
-                    <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
-                    <exclude>org.antlr:antlr4</exclude>
-                    <exclude>org.jenkins-ci:annotation-indexer</exclude>
-                    <exclude>org.jenkins-ci:commons-jelly</exclude>
-                    <exclude>org.jenkins-ci:crypto-util</exclude>
-                    <exclude>org.jenkins-ci.main:cli</exclude>
-                    <exclude>org.jenkins-ci.main:jenkins-core</exclude>
-                    <exclude>org.jenkins-ci.main:remoting</exclude>
-                    <exclude>org.jenkins-ci.main:websocket-jetty10</exclude>
-                    <exclude>org.jenkins-ci.main:websocket-spi</exclude>
-                    <exclude>org.jenkins-ci:memory-monitor</exclude>
-                    <exclude>org.jenkins-ci:symbol-annotation</exclude>
-                    <exclude>org.jenkins-ci:task-reactor</exclude>
-                    <exclude>org.jenkins-ci:version-number</exclude>
-                    <exclude>org.jvnet.hudson:commons-jelly-tags-define</exclude>
-                    <exclude>org.jvnet.winp:winp</exclude>
-                    <exclude>org.kohsuke:access-modifier-annotation</exclude>
-                    <exclude>org.kohsuke.stapler:json-lib</exclude>
-                    <exclude>org.kohsuke.stapler:stapler</exclude>
-                    <exclude>org.kohsuke.stapler:stapler-groovy</exclude>
-                    <exclude>org.kohsuke.stapler:stapler-jelly</exclude>
-                  </excludes>
-                </enforceBytecodeVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <release>8</release>
-          <testRelease>8</testRelease>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <release>8</release>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <!-- version specified in grandparent pom -->