From 361666926cf26302b1e1bda2e2e9347bedd01f84 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 10 May 2022 15:21:46 +0000
Subject: [PATCH 01/16] [maven-release-plugin] prepare release jenkins-2.347

---
 bom/pom.xml      | 2 +-
 cli/pom.xml      | 2 +-
 core/pom.xml     | 2 +-
 coverage/pom.xml | 2 +-
 pom.xml          | 4 ++--
 test/pom.xml     | 2 +-
 war/pom.xml      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index cf75ee27e20e..83ec85088504 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.347</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index 2bfaf2dd6a86..a902ab99c7e4 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.347</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index bf1b35b11045..ee6910dff382 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.347</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 9f27c8d11cf0..8b97b4b597e8 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.347</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index d712bb28a456..8454429338d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>2.347</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -61,7 +61,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>${scmTag}</tag>
+    <tag>jenkins-2.347</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
diff --git a/test/pom.xml b/test/pom.xml
index 5e61a138da45..612654b978d7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.347</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index dcdf9ebb993c..94d3b32357ba 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>${revision}${changelist}</version>
+    <version>2.347</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>

From eb997ae74d74bdd93d131b79ed8adfb2b33942f2 Mon Sep 17 00:00:00 2001
From: Jenkins Release Bot
 <66998184+jenkins-release-bot@users.noreply.github.com>
Date: Tue, 10 May 2022 15:22:06 +0000
Subject: [PATCH 02/16] [maven-release-plugin] prepare for next development
 iteration

---
 bom/pom.xml      | 2 +-
 cli/pom.xml      | 2 +-
 core/pom.xml     | 2 +-
 coverage/pom.xml | 2 +-
 pom.xml          | 6 +++---
 test/pom.xml     | 2 +-
 war/pom.xml      | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bom/pom.xml b/bom/pom.xml
index 83ec85088504..cf75ee27e20e 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.347</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-bom</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index a902ab99c7e4..2bfaf2dd6a86 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.347</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index ee6910dff382..bf1b35b11045 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.347</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>
diff --git a/coverage/pom.xml b/coverage/pom.xml
index 8b97b4b597e8..9f27c8d11cf0 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.347</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-coverage</artifactId>
diff --git a/pom.xml b/pom.xml
index 8454429338d1..5f795a6b8ab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-parent</artifactId>
-  <version>2.347</version>
+  <version>${revision}${changelist}</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
@@ -61,7 +61,7 @@ THE SOFTWARE.
   <scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
     <connection>scm:git:https://github.com/jenkinsci/jenkins.git</connection>
     <developerConnection>scm:git:git@github.com:jenkinsci/jenkins.git</developerConnection>
-    <tag>jenkins-2.347</tag>
+    <tag>${scmTag}</tag>
     <url>https://github.com/jenkinsci/jenkins</url>
   </scm>
 
@@ -71,7 +71,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.347</revision>
+    <revision>2.348</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- *.html files are in UTF-8, and *.properties are in iso-8859-1, so this configuration is actually incorrect,
diff --git a/test/pom.xml b/test/pom.xml
index 612654b978d7..5e61a138da45 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.347</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-test</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 94d3b32357ba..dcdf9ebb993c 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>jenkins-parent</artifactId>
-    <version>2.347</version>
+    <version>${revision}${changelist}</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>

From 84b23a49ea7cc97495cea050b16b39e03de92a3e Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Wed, 11 May 2022 14:25:06 +0200
Subject: [PATCH 03/16] [JENKINS-68381] Allow to set id and style for l:icon
 with symbols (#6532)

---
 .../main/java/org/jenkins/ui/icon/IconSet.java  | 10 +++++++++-
 core/src/main/resources/lib/layout/icon.jelly   |  1 +
 .../java/org/jenkins/ui/icon/IconSetTest.java   | 17 +++++++++++------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/jenkins/ui/icon/IconSet.java b/core/src/main/java/org/jenkins/ui/icon/IconSet.java
index 3f7dd29792a7..13e6716d2a0d 100644
--- a/core/src/main/java/org/jenkins/ui/icon/IconSet.java
+++ b/core/src/main/java/org/jenkins/ui/icon/IconSet.java
@@ -81,7 +81,7 @@ private static String prependTitleIfRequired(String icon, String title) {
 
     // for Jelly
     @Restricted(NoExternalUse.class)
-    public static String getSymbol(String name, String title, String tooltip, String classes, String pluginName) {
+    public static String getSymbol(String name, String title, String tooltip, String classes, String pluginName, String id) {
         String translatedName = cleanName(name);
 
         String identifier = Util.fixEmpty(pluginName) == null ? "core" : pluginName;
@@ -91,9 +91,13 @@ public static String getSymbol(String name, String title, String tooltip, String
             String symbol = symbolsForLookup.get(translatedName);
             symbol = symbol.replaceAll("(class=\")[^&]*?(\")", "$1$2");
             symbol = symbol.replaceAll("(tooltip=\")[^&]*?(\")", "");
+            symbol = symbol.replaceAll("(id=\")[^&]*?(\")", "");
             if (!tooltip.isEmpty()) {
                 symbol = symbol.replaceAll("<svg", "<svg tooltip=\"" + tooltip + "\"");
             }
+            if (!id.isEmpty()) {
+                 symbol = symbol.replaceAll("<svg", "<svg id=\"" + id + "\"");
+            }
             symbol = symbol.replaceAll("<svg", "<svg class=\"" + classes + "\"");
             return prependTitleIfRequired(symbol, title);
         }
@@ -116,9 +120,13 @@ public static String getSymbol(String name, String title, String tooltip, String
         symbol = symbol.replaceAll("(<title>)[^&]*(</title>)", "$1$2");
         symbol = symbol.replaceAll("(class=\")[^&]*?(\")", "$1$2");
         symbol = symbol.replaceAll("(tooltip=\")[^&]*?(\")", "$1$2");
+        symbol = symbol.replaceAll("(id=\")[^&]*?(\")", "");
         if (!tooltip.isEmpty()) {
             symbol = symbol.replaceAll("<svg", "<svg tooltip=\"" + tooltip + "\"");
         }
+        if (!id.isEmpty()) {
+            symbol = symbol.replaceAll("<svg", "<svg id=\"" + id + "\"");
+        }
         symbol = symbol.replaceAll("<svg", "<svg aria-hidden=\"true\"");
         symbol = symbol.replaceAll("<svg", "<svg class=\"" + classes + "\"");
         symbol = symbol.replace("stroke:#000", "stroke:currentColor");
diff --git a/core/src/main/resources/lib/layout/icon.jelly b/core/src/main/resources/lib/layout/icon.jelly
index 5e0479554a81..4da9d676d8a6 100644
--- a/core/src/main/resources/lib/layout/icon.jelly
+++ b/core/src/main/resources/lib/layout/icon.jelly
@@ -70,6 +70,7 @@ THE SOFTWARE.
         <j:arg value="${attrs.tooltip ?: ''}" />
         <j:arg value="${iconMetadata.classSpec ?: ''}" />
         <j:arg value="${h.extractPluginNameFromIconSrc(iconSrc)}" />
+        <j:arg value="${attrs.id ?: ''}" />
       </j:invokeStatic>
       <j:out value="${icon}" />
     </j:when>
diff --git a/core/src/test/java/org/jenkins/ui/icon/IconSetTest.java b/core/src/test/java/org/jenkins/ui/icon/IconSetTest.java
index c52a4a45dd78..7c462457fdd8 100644
--- a/core/src/test/java/org/jenkins/ui/icon/IconSetTest.java
+++ b/core/src/test/java/org/jenkins/ui/icon/IconSetTest.java
@@ -21,34 +21,39 @@ void testIconSetSize() {
 
     @Test
     void getSymbol() {
-        String symbol = IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "");
+        String symbol = IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "", "id");
 
         assertThat(symbol, containsString("<span class=\"jenkins-visually-hidden\">Title</span>"));
         assertThat(symbol, containsString("tooltip=\"Tooltip\""));
         assertThat(symbol, containsString("class=\"class1 class2\""));
+        assertThat(symbol, containsString("id=\"id\""));
     }
 
     @Test
     void getSymbol_cachedSymbolDoesntReturnAttributes() {
-        IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "");
-        String symbol = IconSet.getSymbol("download", "", "", "", "");
+        IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "", "id");
+        String symbol = IconSet.getSymbol("download", "", "", "", "", "");
 
         assertThat(symbol, not(containsString("<span class=\"jenkins-visually-hidden\">Title</span>")));
         assertThat(symbol, not(containsString("tooltip=\"Tooltip\"")));
         assertThat(symbol, not(containsString("class=\"class1 class2\"")));
+        assertThat(symbol, not(containsString("id=\"id\"")));
+
     }
 
     @Test
     void getSymbol_cachedSymbolAllowsSettingAllAttributes() {
-        IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "");
-        String symbol = IconSet.getSymbol("download", "Title2", "Tooltip2", "class3 class4", "");
+        IconSet.getSymbol("download", "Title", "Tooltip", "class1 class2", "", "id");
+        String symbol = IconSet.getSymbol("download", "Title2", "Tooltip2", "class3 class4", "", "id2");
 
         assertThat(symbol, not(containsString("<span class=\"jenkins-visually-hidden\">Title</span>")));
         assertThat(symbol, not(containsString("tooltip=\"Tooltip\"")));
         assertThat(symbol, not(containsString("class=\"class1 class2\"")));
+        assertThat(symbol, not(containsString("id=\"id\"")));
         assertThat(symbol, containsString("<span class=\"jenkins-visually-hidden\">Title2</span>"));
         assertThat(symbol, containsString("tooltip=\"Tooltip2\""));
         assertThat(symbol, containsString("class=\"class3 class4\""));
+        assertThat(symbol, containsString("id=\"id2\""));
     }
 
     /**
@@ -57,7 +62,7 @@ void getSymbol_cachedSymbolAllowsSettingAllAttributes() {
      */
     @Test
     void getSymbol_notSettingTooltipDoesntAddTooltipAttribute() {
-        String symbol = IconSet.getSymbol("download", "Title", "", "class1 class2", "");
+        String symbol = IconSet.getSymbol("download", "Title", "", "class1 class2", "", "id");
 
         assertThat(symbol, not(containsString("tooltip")));
     }

From bd7bdc327cbd7a42102ac46230bee9c1e770c35a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 May 2022 08:54:51 -0700
Subject: [PATCH 04/16] Bump `jenkins-test-harness` from 1746.v2b_3c5d1983b_e
 to 1751.v11e83a_ecfe14 (#6557)

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 5e61a138da45..e47c401ef355 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -85,7 +85,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1746.v2b_3c5d1983b_e</version>
+      <version>1751.v11e83a_ecfe14</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From aa0513ee10673b5f02afc0593eacc9dcd984e872 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 11 May 2022 08:59:33 -0700
Subject: [PATCH 05/16] Revert JENKINS-20679 (support for plugin Java
 requirement metadata) (#6549)

Co-authored-by: Tim Jacomb <timjacomb1+github@gmail.com>
---
 core/src/main/java/hudson/PluginManager.java  | 13 ----
 core/src/main/java/hudson/PluginWrapper.java  | 24 ------
 .../main/java/hudson/model/UpdateSite.java    | 73 +------------------
 .../java/jenkins/install/SetupWizard.java     |  2 +-
 .../jenkins/plugins/DetachedPluginsUtil.java  | 22 +-----
 .../main/resources/hudson/Messages.properties |  8 --
 .../resources/hudson/Messages_es.properties   |  8 --
 .../resources/hudson/Messages_it.properties   |  1 -
 .../hudson/Messages_pt_BR.properties          |  8 --
 .../hudson/Messages_zh_TW.properties          |  4 -
 .../hudson/PluginManager/table.jelly          |  8 --
 .../hudson/PluginManager/table.properties     |  7 --
 .../hudson/PluginManager/table_it.properties  |  8 --
 .../PluginManager/table_pt_BR.properties      |  7 --
 .../PluginManager/table_zh_TW.properties      |  2 -
 .../main/resources/jenkins/split-plugins.txt  |  4 +-
 .../plugins/DetachedPluginsUtilTest.java      | 16 +---
 .../java/hudson/model/UpdateSiteTest.java     | 33 ---------
 .../plugins/minJavaVersion-update-center.json | 57 ---------------
 .../js/templates/plugin-manager/available.hbs |  5 --
 20 files changed, 13 insertions(+), 297 deletions(-)
 delete mode 100644 test/src/test/resources/plugins/minJavaVersion-update-center.json

diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index e4575086d9fb..c3cd3a750e6d 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -1412,16 +1412,6 @@ public HttpResponse doPluginsSearch(@QueryParameter String query, @QueryParamete
                     if (plugin.isForNewerHudson()) {
                         jsonObject.put("newerCoreRequired", Messages.PluginManager_coreWarning(plugin.requiredCore));
                     }
-                    if (plugin.isForNewerJava()) {
-                        jsonObject.put("newerJavaRequired", Messages.PluginManager_javaWarning(plugin.minimumJavaVersion));
-                    }
-                    if (plugin.isNeededDependenciesForNewerJava()) {
-                        VersionNumber javaVersion = plugin.getNeededDependenciesMinimumJavaVersion();
-                        if (javaVersion == null) {
-                            throw new IllegalStateException("java version cannot be null here");
-                        }
-                        jsonObject.put("dependenciesNewerJava", Messages.PluginManager_depJavaWarning(javaVersion.toString()));
-                    }
                     if (plugin.hasWarnings()) {
                         JSONObject unresolvedSecurityWarnings = new JSONObject();
                         unresolvedSecurityWarnings.put("text", Messages.PluginManager_securityWarning());
@@ -2057,9 +2047,6 @@ private void logPluginWarnings(Map.Entry<String, VersionNumber> requestedPlugin,
         if (toInstall.isForNewerHudson()) {
             LOGGER.log(WARNING, "{0}@{1} was built for a newer Jenkins", new Object[] {toInstall.name, toInstall.version});
         }
-        if (toInstall.isForNewerJava()) {
-            LOGGER.log(WARNING, "{0}@{1} was built for a newer Java", new Object[] {toInstall.name, toInstall.version});
-        }
     }
 
     /**
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
index a42596726cdb..aa408cf9c752 100644
--- a/core/src/main/java/hudson/PluginWrapper.java
+++ b/core/src/main/java/hudson/PluginWrapper.java
@@ -43,7 +43,6 @@
 import hudson.model.UpdateCenter;
 import hudson.model.UpdateSite;
 import hudson.util.VersionNumber;
-import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
@@ -75,7 +74,6 @@
 import jenkins.security.UpdateSiteWarningsMonitor;
 import jenkins.util.AntClassLoader;
 import jenkins.util.URLClassLoader2;
-import jenkins.util.java.JavaUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.LogFactory;
 import org.kohsuke.accmod.Restricted;
@@ -690,20 +688,6 @@ private String getVersionOf(Manifest manifest) {
         return null;
     }
 
-    /**
-     * Returns the minimum Java version of this plugin, as specified in the plugin metadata.
-     * Generally coming from the {@code java.level} extracted as MANIFEST's metadata with
-     * <a href="https://github.com/jenkinsci/plugin-pom/pull/134">this addition on the plugins' parent pom</a>.
-     *
-     * @see <a href="https://github.com/jenkinsci/maven-hpi-plugin/pull/75">maven-hpi-plugin#PR-75</a>
-     *
-     * @since 2.158
-     */
-    @Exported
-    public @CheckForNull String getMinimumJavaVersion() {
-        return manifest.getMainAttributes().getValue("Minimum-Java-Version");
-    }
-
     /**
      * Returns the version number of this plugin
      */
@@ -958,14 +942,6 @@ public boolean hasLicensesXml() {
                     versionDependencyError(Messages.PluginWrapper_obsoleteCore(Jenkins.getVersion().toString(), requiredCoreVersion), Jenkins.getVersion().toString(), requiredCoreVersion);
                 }
             }
-
-            String minimumJavaVersion = getMinimumJavaVersion();
-            if (minimumJavaVersion != null) {
-                JavaSpecificationVersion actualVersion = JavaUtils.getCurrentJavaRuntimeVersionNumber();
-                if (actualVersion.isOlderThan(new JavaSpecificationVersion(minimumJavaVersion))) {
-                    versionDependencyError(Messages.PluginWrapper_obsoleteJava(actualVersion.toString(), minimumJavaVersion), actualVersion.toString(), minimumJavaVersion);
-                }
-            }
         }
         // make sure dependencies exist
         for (Dependency d : dependencies) {
diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index 985aef2020e1..389e3cb3890f 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -44,7 +44,6 @@
 import hudson.util.HttpResponses;
 import hudson.util.TextFile;
 import hudson.util.VersionNumber;
-import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -80,7 +79,6 @@
 import jenkins.util.JSONSignatureValidator;
 import jenkins.util.PluginLabelUtil;
 import jenkins.util.SystemProperties;
-import jenkins.util.java.JavaUtils;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONException;
 import net.sf.json.JSONObject;
@@ -1141,13 +1139,6 @@ public final class Plugin extends Entry {
          */
         @Exported
         public final String requiredCore;
-        /**
-         * Version of Java this plugin requires to run.
-         *
-         * @since 2.158
-         */
-        @Exported
-        public final String minimumJavaVersion;
         /**
          * Categories for grouping plugins, taken from labels assigned to wiki page.
          * Can be {@code null} if the update center does not return categories.
@@ -1211,7 +1202,6 @@ public Plugin(String sourceId, JSONObject o) {
             this.title = get(o, "title");
             this.excerpt = get(o, "excerpt");
             this.compatibleSinceVersion = Util.intern(get(o, "compatibleSinceVersion"));
-            this.minimumJavaVersion = Util.intern(get(o, "minimumJavaVersion"));
             this.latest = get(o, "latest");
             this.requiredCore = Util.intern(get(o, "requiredCore"));
             final String releaseTimestamp = get(o, "releaseTimestamp");
@@ -1301,9 +1291,9 @@ public boolean isCompatible() {
 
         @Restricted(NoExternalUse.class) // table.jelly
         public boolean isCompatible(PluginManager.MetadataCache cache) {
-            return isCompatibleWithInstalledVersion() && !isForNewerHudson() &&  !isForNewerJava() &&
+            return isCompatibleWithInstalledVersion() && !isForNewerHudson() &&
                     isNeededDependenciesCompatibleWithInstalledVersion(cache) &&
-                    !isNeededDependenciesForNewerJenkins(cache) && !isNeededDependenciesForNewerJava();
+                    !isNeededDependenciesForNewerJenkins(cache);
         }
 
         /**
@@ -1387,21 +1377,6 @@ public boolean isForNewerHudson() {
             }
         }
 
-        /**
-         * Returns true iff the plugin declares a minimum Java version and it's newer than what the Jenkins master is running on.
-         * @since 2.158
-         */
-        public boolean isForNewerJava() {
-            try {
-                final JavaSpecificationVersion currentRuntimeJavaVersion = JavaUtils.getCurrentJavaRuntimeVersionNumber();
-                return minimumJavaVersion != null && new JavaSpecificationVersion(minimumJavaVersion).isNewerThan(
-                        currentRuntimeJavaVersion);
-            } catch (NumberFormatException nfe) {
-                logBadMinJavaVersion();
-                return false; // treat this as undeclared minimum Java version
-            }
-        }
-
         public VersionNumber getNeededDependenciesRequiredCore() {
             VersionNumber versionNumber = null;
             try {
@@ -1416,36 +1391,6 @@ public VersionNumber getNeededDependenciesRequiredCore() {
             return versionNumber;
         }
 
-        /**
-         * Returns the minimum Java version needed to use the plugin and all its dependencies.
-         * @since 2.158
-         * @return the minimum Java version needed to use the plugin and all its dependencies, or null if unspecified.
-         */
-        @CheckForNull
-        public VersionNumber getNeededDependenciesMinimumJavaVersion() {
-            VersionNumber versionNumber = null;
-            try {
-                versionNumber = minimumJavaVersion == null ? null : new VersionNumber(minimumJavaVersion);
-            } catch (NumberFormatException nfe) {
-                logBadMinJavaVersion();
-            }
-            for (Plugin p : getNeededDependencies()) {
-                VersionNumber v = p.getNeededDependenciesMinimumJavaVersion();
-                if (v == null) {
-                    continue;
-                }
-                if (versionNumber == null || v.isNewerThan(versionNumber)) {
-                    versionNumber = v;
-                }
-            }
-            return versionNumber;
-        }
-
-        private void logBadMinJavaVersion() {
-            LOGGER.log(Level.WARNING, "minimumJavaVersion was specified for plugin {0} but unparseable (received {1})",
-                       new String[]{this.name, this.minimumJavaVersion});
-        }
-
         public boolean isNeededDependenciesForNewerJenkins() {
             return isNeededDependenciesForNewerJenkins(new PluginManager.MetadataCache());
         }
@@ -1462,20 +1407,6 @@ public boolean isNeededDependenciesForNewerJenkins(PluginManager.MetadataCache c
             });
         }
 
-        /**
-         * Returns true iff any of the plugin dependencies require a newer Java than Jenkins is running on.
-         *
-         * @since 2.158
-         */
-        public boolean isNeededDependenciesForNewerJava() {
-            for (Plugin p : getNeededDependencies()) {
-                if (p.isForNewerJava() || p.isNeededDependenciesForNewerJava()) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         /**
          * If at least some of the plugin's needed dependencies are already installed, and the new version of the
          * needed dependencies plugin have a "compatibleSinceVersion"
diff --git a/core/src/main/java/jenkins/install/SetupWizard.java b/core/src/main/java/jenkins/install/SetupWizard.java
index b4467b5c9e68..6513823cd82a 100644
--- a/core/src/main/java/jenkins/install/SetupWizard.java
+++ b/core/src/main/java/jenkins/install/SetupWizard.java
@@ -644,7 +644,7 @@ public JSONArray getPlatformPluginUpdates() {
                                         for (UpdateSite site : jenkins.getUpdateCenter().getSiteList()) {
                                             UpdateSite.Plugin sitePlug = site.getPlugin(pluginName);
                                             if (sitePlug != null
-                                                    && !sitePlug.isForNewerHudson() && !sitePlug.isForNewerJava()
+                                                    && !sitePlug.isForNewerHudson()
                                                     && !sitePlug.isNeededDependenciesForNewerJenkins()) {
                                                 foundCompatibleVersion = true;
                                                 break;
diff --git a/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java b/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java
index 9a0bd3d4ed22..779ab79ace89 100644
--- a/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java
+++ b/core/src/main/java/jenkins/plugins/DetachedPluginsUtil.java
@@ -5,7 +5,6 @@
 import hudson.ClassicPluginStrategy;
 import hudson.PluginWrapper;
 import hudson.util.VersionNumber;
-import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -17,7 +16,6 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jenkins.util.java.JavaUtils;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -54,11 +52,9 @@ public class DetachedPluginsUtil {
             DETACHED_LIST = Collections.unmodifiableList(configLines(is).map(line -> {
                 String[] pieces = line.split(" ");
 
-                // defaults to Java 1.0 to install unconditionally if unspecified
                 return new DetachedPluginsUtil.DetachedPlugin(pieces[0],
                                                               pieces[1] + ".*",
-                                                              pieces[2],
-                                                              pieces.length == 4 ? pieces[3] : "1.0");
+                                                              pieces[2]);
             }).collect(Collectors.toList()));
         } catch (IOException x) {
             throw new ExceptionInInitializerError(x);
@@ -101,16 +97,13 @@ public static List<PluginWrapper.Dependency> getImpliedDependencies(String plugi
     }
 
     /**
-     * Get the list of all plugins that have ever been {@link DetachedPlugin detached} from Jenkins core, applicable to the current Java runtime.
+     * Get the list of all plugins that have ever been {@link DetachedPlugin detached} from Jenkins core.
      *
      * @return A {@link List} of {@link DetachedPlugin}s.
-     * @see JavaUtils#getCurrentJavaRuntimeVersionNumber()
      */
     public static @NonNull
     List<DetachedPlugin> getDetachedPlugins() {
-        return DETACHED_LIST.stream()
-                .filter(plugin -> JavaUtils.getCurrentJavaRuntimeVersionNumber().isNewerThanOrEqualTo(plugin.getMinimumJavaVersion()))
-                .collect(Collectors.toList());
+        return Collections.unmodifiableList(new ArrayList<>(DETACHED_LIST));
     }
 
     /**
@@ -174,13 +167,11 @@ public static final class DetachedPlugin {
          */
         private final VersionNumber splitWhen;
         private final String requiredVersion;
-        private final JavaSpecificationVersion minJavaVersion;
 
-        private DetachedPlugin(String shortName, String splitWhen, String requiredVersion, String minJavaVersion) {
+        private DetachedPlugin(String shortName, String splitWhen, String requiredVersion) {
             this.shortName = shortName;
             this.splitWhen = new VersionNumber(splitWhen);
             this.requiredVersion = requiredVersion;
-            this.minJavaVersion = new JavaSpecificationVersion(minJavaVersion);
         }
 
         /**
@@ -215,10 +206,5 @@ public VersionNumber getRequiredVersion() {
         public String toString() {
             return shortName + " " + splitWhen.toString().replace(".*", "") + " " + requiredVersion;
         }
-
-        @NonNull
-        public JavaSpecificationVersion getMinimumJavaVersion() {
-            return minJavaVersion;
-        }
     }
 }
diff --git a/core/src/main/resources/hudson/Messages.properties b/core/src/main/resources/hudson/Messages.properties
index f230ae775826..269870d713f2 100644
--- a/core/src/main/resources/hudson/Messages.properties
+++ b/core/src/main/resources/hudson/Messages.properties
@@ -75,9 +75,6 @@ PluginManager.parentCompatWarning=The following plugins are affected by this:
 PluginManager.coreWarning=\
  Warning: This plugin is built for Jenkins {0} or newer. \
  Jenkins will refuse to load this plugin if installed.
-PluginManager.javaWarning=\
- Warning: This plugin requires Java {0} or newer. \
- Jenkins will refuse to load this plugin if installed.
 PluginManager.depCompatWarning=\
  Warning: This plugin requires newer versions of dependencies and at least one of those plugins is not compatible with the installed version. \
  This is usually the case because its behavior or APIs changed, or it uses a different settings format than the installed version. \
@@ -87,10 +84,6 @@ PluginManager.depCoreWarning=\
  Warning: This plugin has dependencies on other plugins that require Jenkins {0} or newer. \
  Jenkins will refuse to load the dependencies requiring a newer version of Jenkins, \
  and in turn loading this plugin will fail.
-PluginManager.depJavaWarning=\
- Warning: this plugin has dependencies on other plugins that require Java {0} or newer. \
- Jenkins will refuse to load the dependencies requiring a newer version of Jenkins, \
- and in turn loading this plugin will fail.
 PluginManager.securityWarning=\
   Warning: This plugin version may not be safe to use. Please review the following security notices:
 PluginManager.ago={0} ago
@@ -129,7 +122,6 @@ PluginWrapper.failed_to_load_dependency_2=Failed to load: {0} ({1} {2})
 PluginWrapper.disabled_2=Required plugin is disabled: {0} ({1})
 PluginWrapper.obsolete_2=Update required: {0} ({1} {2}) to be updated to {3} or higher
 PluginWrapper.obsoleteCore=Jenkins ({1}) or higher required
-PluginWrapper.obsoleteJava=Java ({1}) or higher required
 PluginWrapper.PluginWrapperAdministrativeMonitor.DisplayName=Plugins Failed To Load
 PluginWrapper.Already.Disabled=The plugin ''{0}'' was already disabled
 PluginWrapper.Plugin.Has.Dependent=The plugin ''{0}'' has, at least, one dependent plugin ({1}) and the disable strategy is {2}, so it cannot be disabled
diff --git a/core/src/main/resources/hudson/Messages_es.properties b/core/src/main/resources/hudson/Messages_es.properties
index bb187a5c68ee..79a08114bc74 100644
--- a/core/src/main/resources/hudson/Messages_es.properties
+++ b/core/src/main/resources/hudson/Messages_es.properties
@@ -76,9 +76,6 @@ PluginManager.parentCompatWarning=Esto afecta a los siguientes plugins:
 PluginManager.coreWarning=\
   Aviso: Este plugin est\u00e1 construido para Jenkins {0} o posterior. \
   Jenkins no cargar\u00e1 este plugin aunque est\u00e1 instalado.
-PluginManager.javaWarning=\
-  Aviso: Este plugin requiere Java {0} o m\u00e1s reciente. \
-  Jenkins no cargar\u00e1 este plugin aunque est\u00e1 instalado.
 PluginManager.depCompatWarning=\
   Aviso: Este plugin requiere versiones m\u00e1s recientes de dependencias y al menos uno de esos plugins no es compatible con la versi\u00f3n instalada. \
   Esto puede ocurrir porque su comportamiento ha cambiado o utiliza un formato de configuraci\u00f3n diferente que la versi\u00f3n instalada. \
@@ -88,10 +85,6 @@ PluginManager.depCoreWarning=\
   Aviso: Este plugin tiene dependencias de otros plugins que requieren Jenkins {0} o m\u00e1s reciente. \
   Jenkins no se cargar\u00e1 las dependencias que requieren una versi\u00f3n m\u00e1s reciente de Jenkins. \
   Por lo que no poder\u00e1 cargar este plugin.
-PluginManager.depJavaWarning=\
-  Aviso: Este plugin tiene dependencias de otros plugins que requieren Java {0} o m\u00e1s reciente. \
-  Jenkins no se cargar\u00e1 las dependencias que requieren una versi\u00f3n m\u00e1s reciente de Jenkins. \
-  Por lo que no poder\u00e1 cargar este plugin.
 PluginManager.securityWarning=\
   Aviso: Esta versi\u00f3n del plugin puede no ser segura. Por favor, revise los siguientes avisos de seguridad:
 PluginManager.ago=Hace {0}
@@ -126,7 +119,6 @@ PluginWrapper.disabledAndObsolete=Acutalizaci\u00f3n requerida: {0} ({1}) a {2}
 PluginWrapper.disabled=El plugin requerido est\u00e1 desactivado: {0}
 PluginWrapper.obsolete=Acutalizaci\u00f3n requerida: {0} ({1}) va a actualizar a {2} o superior
 PluginWrapper.obsoleteCore=Se requiere Jenkins ({1}) o superior
-PluginWrapper.obsoleteJava=Se requiere Java ({1}) o superior
 PluginWrapper.PluginWrapperAdministrativeMonitor.DisplayName=No se pueden cargar los plugins
 PluginWrapper.Already.Disabled=El plugin {0} ya estaba deshabilitado
 PluginWrapper.Plugin.Has.Dependant=El plugin {0} tiene, al menos, un plugin dependiente ({1}) y la estrategia de deshabilitaci\u00F3n es {2}, as\u00ED que no puede ser deshabilitado
diff --git a/core/src/main/resources/hudson/Messages_it.properties b/core/src/main/resources/hudson/Messages_it.properties
index 4e0a19e4c47f..b8d21635e891 100644
--- a/core/src/main/resources/hudson/Messages_it.properties
+++ b/core/src/main/resources/hudson/Messages_it.properties
@@ -98,7 +98,6 @@ PluginWrapper.NoSuchPlugin=Non 
 PluginWrapper.obsolete=Aggiornamento richiesto: {0} ({1}) deve essere \
   aggiornato alla versione {2} o successiva
 PluginWrapper.obsoleteCore=� richiesto Jenkins ({1}) o una versione successiva
-PluginWrapper.obsoleteJava=� richiesto Java ({1}) o una versione successiva
 PluginWrapper.Plugin.Disabled=Componente aggiuntivo "{0}" disabilitato
 PluginWrapper.Plugin.Has.Dependent=Il componente aggiuntivo "{0}" ha almeno \
   un componente aggiuntivo dipendente ({1}) e la strategia di disabilitazione \
diff --git a/core/src/main/resources/hudson/Messages_pt_BR.properties b/core/src/main/resources/hudson/Messages_pt_BR.properties
index 75287b5c8dad..0a7eb5601afb 100644
--- a/core/src/main/resources/hudson/Messages_pt_BR.properties
+++ b/core/src/main/resources/hudson/Messages_pt_BR.properties
@@ -68,13 +68,8 @@ PluginWrapper.NoSuchPlugin=Nenhuma extens\u00E3o encontrada com o nome ''{0}''
 PluginWrapper.failed_to_load_plugin_2=Falhou para carregar: {0} ({1} {2})
 PluginManager.invalidUrl= \
   Voc\u00EA est\u00E1 usando uma URL inv\u00E1lida para baixar a extens\u00E3o, somente https e http (n\u00E3o recomendado) s\u00E3o suportados.
-PluginManager.depJavaWarning= \
-  Aviso: esta extens\u00E3o tem dependencias de outras extens\u00F5es que requerem Java {0} ou mais recente. \
-  O Jenkins se recusar\u00E1 a carregar as dependencias que requerem uma nova vers\u00E3o dele e \
-  como resultado o carregamento da extens\u00E3o ir\u00E1 falhar.
 PluginWrapper.Already.Disabled=A extens\u00E3o ''{0}'' j\u00E1 foi desabilitada
 PluginWrapper.disabled_2=A extens\u00E3o requerida est\u00E1 desabilitada: {0} {1}
-PluginWrapper.obsoleteJava=Java ({1}) ou maior \u00E9 requerido
 PluginManager.parentDepCompatWarning=As seguintes extens\u00F5es s\u00E3o incompat\u00EDveis:
 PluginManager.PluginDeprecationMonitor.DisplayName=Monitor de extens\u00F5es descontinuadas
 Util.month={0} m\u00EAs
@@ -108,9 +103,6 @@ PluginManager.adoptThisPlugin= \
   Visite nossa iniciativa \
   <a href="https://www.jenkins.io/doc/developer/plugin-governance/adopt-a-plugin/" rel="noopener noreferrer" \
   target="_blank">Adopt a Plugin</a> para maiores informa\u00E7\u00F5es.
-PluginManager.javaWarning= \
-  Aviso: esta extens\u00E3o requer o Java na vers\u00E3o {0} ou mais recente. \
-  O Jenkins se recusar\u00E1 a carregar esta extens\u00E3o se instalada.
 PluginManager.compatWarning= \
   Aviso: a vers\u00E3o mais nova desta extens\u00E3o est\u00E1 marcada como incompat\u00EDvel com a vers\u00E3o instalada. \
   Isto geralmente acontece por seu comportamento ou APIs mudaram ou porque ela tem configura\u00E7\u00F5es em formato diferente \
diff --git a/core/src/main/resources/hudson/Messages_zh_TW.properties b/core/src/main/resources/hudson/Messages_zh_TW.properties
index cbbac736753d..05b5a9efecb9 100644
--- a/core/src/main/resources/hudson/Messages_zh_TW.properties
+++ b/core/src/main/resources/hudson/Messages_zh_TW.properties
@@ -65,10 +65,7 @@ PluginManager.compatWarning=\u8b66\u544a\: \u65b0\u7248\u672c\u4e0d\u76f8\u5bb9\
 PluginManager.parentDepCompatWarning=\u4e0b\u5217\u5916\u639b\u4e0d\u76f8\u5bb9\:
 PluginManager.parentCompatWarning=\u4e0b\u5217\u5916\u639b\u6703\u53d7\u5230\u5f71\u97ff\:
 PluginManager.coreWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7a0b\u5f0f\u662f\u70ba Jenkins {0} \u4e4b\u5f8c\u7684\u7248\u672c\u8a2d\u8a08\u3002\u5728\u60a8\u76ee\u524d\u7684 Jenkins \u4e0d\u898b\u5f97\u53ef\u4ee5\u6b63\u5e38\u904b\u4f5c\u3002
-PluginManager.javaWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7a0b\u5f0f\u9700\u8981 Java {0} \u6216\u66f4\u65b0\u7248\u672c\u3002\u5728\u60a8\u76ee\u524d\u7684 Jenkins \u4e0d\u898b\u5f97\u53ef\u4ee5\u6b63\u5e38\u904b\u4f5c\u3002
-PluginManager.depCompatWarning=\u8b66\u544a\: \u6b64\u5916\u639b\u9700\u8981\u66f4\u65b0\u76f8\u4f9d\u6027\u5916\u639b\uff0c\u4e14\u5176\u4e2d\u81f3\u5c11\u6709\u4e00\u500b\u4e0d\u76f8\u5bb9\u65bc\u76ee\u524d\u7248\u672c\u3002\u9019\u901a\u5e38\u662f\u56e0\u70ba\u5b83\u672c\u8eab\u7684\u884c\u70ba\u6a21\u5f0f\u6216 API \u6709\u66f4\u52d5\uff0c\u6216\u5b83\u7684\u8a2d\u5b9a\u503c\u683c\u5f0f\u4e0d\u540c\u65bc\u76ee\u524d\u7248\u672c\u3002\u5176\u4ed6\u76f8\u4f9d\u65bc\u5b83\u7684\u5916\u639b\u53ef\u80fd\u6703\u4e0d\u76f8\u5bb9\u65bc\u6b64\u66f4\u65b0\u4e26\u4e14\u4e0d\u518d\u5982\u9810\u671f\u5730\u904b\u4f5c\uff0c\u4f7f\u7528\u6b64\u5916\u639b\u7684\u4f5c\u696d\u53ef\u80fd\u9700\u8981\u91cd\u65b0\u8a2d\u5b9a\u3002\u60a8\u53ef\u80fd\u5f97\u624b\u52d5\u9084\u539f\u820a\u8a2d\u5b9a\u503c\u624d\u80fd\u9084\u539f\u5230\u820a\u7248\u3002\u8a73\u60c5\u8acb\u53c3\u8003\u6b64\u5916\u639b\u7684\u767c\u884c\u8cc7\u8a0a\u3002
 PluginManager.depCoreWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7684\u76f8\u4f9d\u6027\u5916\u639b\u9700\u8981 Jenkins {0} \u6216\u66f4\u65b0\u7248\u672c\u3002Jenkins \u5c07\u6703\u62d2\u7d55\u8f09\u5165\u8a72\u76f8\u4f9d\u6027\u5916\u639b\uff0c\u9019\u6703\u5c0e\u81f4\u9019\u500b\u5916\u639b\u8f09\u5165\u5931\u6557\u3002
-PluginManager.depJavaWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7684\u76f8\u4f9d\u6027\u5916\u639b\u9700\u8981 Java {0} \u6216\u66f4\u65b0\u7248\u672c\u3002Jenkins \u5c07\u6703\u62d2\u7d55\u8f09\u5165\u8a72\u76f8\u4f9d\u6027\u5916\u639b\uff0c\u9019\u6703\u5c0e\u81f4\u9019\u500b\u5916\u639b\u8f09\u5165\u5931\u6557\u3002
 PluginManager.securityWarning=\u8b66\u544a\: \u9019\u500b\u7248\u672c\u7684\u5916\u639b\u7528\u8d77\u4f86\u53ef\u80fd\u4e0d\u5b89\u5168\u3002\u8acb\u67e5\u770b\u4e0b\u5217\u5b89\u5168\u6027\u9808\u77e5\:
 PluginManager.ago={0}\u524d
 PluginManager.adoptThisPlugin=<strong>\u6b64\u5916\u639b\u958b\u653e\u8a8d\u990a\uff01</strong>\u6211\u5011\u6b63\u5728\u5c0b\u627e\u65b0\u7684\u7dad\u8b77\u8005\uff0c\u8acb\u9020\u8a2a <a href\="https\://www.jenkins.io/doc/developer/plugin-governance/adopt-a-plugin/" rel\="noopener noreferrer" target\="_blank">Adopt a Plugin</a> \u53d6\u5f97\u66f4\u591a\u8cc7\u8a0a\u3002
@@ -97,7 +94,6 @@ PluginWrapper.failed_to_load_dependency_2=\u8f09\u5165\u5931\u6557\: {0} ({1} {2
 PluginWrapper.disabled_2=\u5fc5\u8981\u7684\u5916\u639b\u5df2\u88ab\u505c\u7528\: {0} ({1})
 PluginWrapper.obsolete_2=\u9700\u8981\u66f4\u65b0\: {0} ({1} {2}) \u9700\u8981\u66f4\u65b0\u5230 {3} \u6216\u66f4\u65b0\u7684\u7248\u672c
 PluginWrapper.obsoleteCore=\u9700\u8981 Jenkins ({1}) \u6216\u66f4\u65b0\u7248\u672c
-PluginWrapper.obsoleteJava=\u9700\u8981 Java ({1}) \u6216\u66f4\u65b0\u7248\u672c
 PluginWrapper.PluginWrapperAdministrativeMonitor.DisplayName=\u8f09\u5165\u5916\u639b\u5931\u6557
 PluginWrapper.Already.Disabled=\u5916\u639b\u300c{0}\u300d\u65e9\u5df2\u505c\u7528
 PluginWrapper.Plugin.Has.Dependent=\u5916\u639b\u300c{0}\u300d\u6709\u81f3\u5c11\u4e00\u500b\u76f8\u4f9d\u6027\u5916\u639b ({1}) \u4e14\u505c\u7528\u7b56\u7565\u70ba {2}\uff0c\u56e0\u6b64\u7121\u6cd5\u88ab\u505c\u7528
diff --git a/core/src/main/resources/hudson/PluginManager/table.jelly b/core/src/main/resources/hudson/PluginManager/table.jelly
index b64f6344e650..feef003ce2a0 100644
--- a/core/src/main/resources/hudson/PluginManager/table.jelly
+++ b/core/src/main/resources/hudson/PluginManager/table.jelly
@@ -155,9 +155,6 @@ THE SOFTWARE.
                     <j:if test="${p.isForNewerHudson()}">
                       <div class="alert alert-danger">${%coreWarning(p.requiredCore)}</div>
                     </j:if>
-                    <j:if test="${p.isForNewerJava()}">
-                      <div class="alert alert-danger">${%javaWarning(p.minimumJavaVersion)}</div>
-                    </j:if>
                     <j:if test="${p.fixesSecurityVulnerabilities()}">
                       <div class="alert alert-warning">
                         ${%Applying this update will address security vulnerabilities in the currently installed version.}
@@ -184,11 +181,6 @@ THE SOFTWARE.
                         ${%depCoreWarning(p.getNeededDependenciesRequiredCore().toString())}
                       </div>
                     </j:if>
-                    <j:if test="${p.isNeededDependenciesForNewerJava()}">
-                      <div class="alert alert-danger">
-                        ${%depJavaWarning(p.getNeededDependenciesMinimumJavaVersion().toString())}
-                      </div>
-                    </j:if>
                     <j:if test="${p.hasWarnings()}">
                       <div class="alert alert-danger">${%securityWarning}
                         <ul>
diff --git a/core/src/main/resources/hudson/PluginManager/table.properties b/core/src/main/resources/hudson/PluginManager/table.properties
index 21d7b265b55b..78ee0550a203 100644
--- a/core/src/main/resources/hudson/PluginManager/table.properties
+++ b/core/src/main/resources/hudson/PluginManager/table.properties
@@ -29,9 +29,6 @@ parentCompatWarning=The following plugins are affected by this:
 coreWarning=\
  Warning: This plugin is built for Jenkins {0} or newer. \
  Jenkins will refuse to load this plugin if installed.
-javaWarning=\
- Warning: This plugin requires Java {0} or newer. \
- Jenkins will refuse to load this plugin if installed.
 depCompatWarning=\
  Warning: This plugin requires newer versions of dependencies and at least one of those plugins is not compatible with the installed version. \
  This is usually the case because its behavior changed, or it uses a different settings format than the installed version. \
@@ -41,10 +38,6 @@ depCoreWarning=\
  Warning: This plugin has dependencies on other plugins that require Jenkins {0} or newer. \
  Jenkins will refuse to load the dependencies requiring a newer version of Jenkins, \
  and in turn loading this plugin will fail.
-depJavaWarning=\
- Warning: this plugin has dependencies on other plugins that require Java {0} or newer. \
- Jenkins will refuse to load the dependencies requiring a newer version of Jenkins, \
- and in turn loading this plugin will fail.
 securityWarning=\
   Warning: This plugin version may not be safe to use. Please review the following security notices:
 ago={0} ago
diff --git a/core/src/main/resources/hudson/PluginManager/table_it.properties b/core/src/main/resources/hudson/PluginManager/table_it.properties
index 274fa48c6512..4b62e3f54c4e 100644
--- a/core/src/main/resources/hudson/PluginManager/table_it.properties
+++ b/core/src/main/resources/hudson/PluginManager/table_it.properties
@@ -59,11 +59,6 @@ depCoreWarning=Avviso: questo componente aggiuntivo dipende da altri \
   rifiuter� di caricare le dipendenze che richiedono una versione pi� recente \
   di Jenkins e, a sua volta, il caricamento di questo componente aggiuntivo \
   non riuscir�.
-depJavaWarning=Avviso: questo componente aggiuntivo dipende da altri \
-  componenti che richiedono Java {0} o una versione successiva. Jenkins si \
-  rifiuter� di caricare le dipendenze che richiedono una versione pi� recente \
-  di Java e, a sua volta, il caricamento di questo componente aggiuntivo \
-  non riuscir�.
 Download\ now\ and\ install\ after\ restart=Scarica ora ed esegui \
   l''installazione dopo il riavvio
 filter=Filtra
@@ -74,9 +69,6 @@ Install\ without\ restart=Installa senza riavviare
 instructions=Utilizzare la casella di ricerca soprastante per cercare i \
   componenti aggiuntivi disponibili.
 loading=Caricamento elenco componenti aggiuntivi in corso...
-javaWarning=Avviso: questo componente aggiuntivo richiede Java {0} o una \
-  versione successiva. Jenkins si rifiuter� di caricare questo componente \
-  aggiuntivo se installato.
 Name=Nome
 newerVersionEntry=Questa versione del componente aggiuntivo esiste ma non � \
   offerta come aggiornamento. Questo � il caso tipico se non sono soddisfatti \
diff --git a/core/src/main/resources/hudson/PluginManager/table_pt_BR.properties b/core/src/main/resources/hudson/PluginManager/table_pt_BR.properties
index 4fdf7d4efe92..e4b00b50d3f1 100644
--- a/core/src/main/resources/hudson/PluginManager/table_pt_BR.properties
+++ b/core/src/main/resources/hudson/PluginManager/table_pt_BR.properties
@@ -66,14 +66,7 @@ deprecationWarning=<strong>Esta extens\u00E3o est\u00E1 descontinuada.</strong>E
   maiores detalhes.</a>
 Released=Liberada
 unavailable=Indispon\u00EDvel
-javaWarning= \
-  Aviso: esta extens\u00E3o requer Java {0} ou mais recente. \
-  O Jenkins se recusar\u00E1 a carregar esta extens\u00E3o se instalada.
 Search=Busca
-depJavaWarning= \
-  Aviso: esta extens\u00E3o tem depend\u00EAncias de outras extens\u00F5es que requerem Java {0} ou mais recente. \
-  O Jenkins se recusar\u00E1 a carregar depend\u00EAncias que requerem uma vers\u00E3o mais nova do Jenkins e portanto \
-  o carregamento desta extens\u00E3o ir\u00E1 falhar.
 ago={0} atr\u00E1s
 Applying\ this\ update\ will\ address\ security\ vulnerabilities\ in\ the\ currently\ installed\ version.=Aplicar\ esta\ atualiza\u00E7\u00E3o\ ir\u00E1\ endere\u00E7ar\ vulnerabilidades\ de\ seguran\u00E7a\ na\ vers\u00E3o\ atualmente\ instalada.
 instructions=instru\u00E7\u00F5es
diff --git a/core/src/main/resources/hudson/PluginManager/table_zh_TW.properties b/core/src/main/resources/hudson/PluginManager/table_zh_TW.properties
index a514fb847302..71b163f17409 100644
--- a/core/src/main/resources/hudson/PluginManager/table_zh_TW.properties
+++ b/core/src/main/resources/hudson/PluginManager/table_zh_TW.properties
@@ -24,10 +24,8 @@ compatWarning=\u8b66\u544a\: \u65b0\u7248\u672c\u4e0d\u76f8\u5bb9\u65bc\u73fe\u5
 parentDepCompatWarning=\u4e0b\u5217\u5916\u639b\u4e0d\u76f8\u5bb9\:
 parentCompatWarning=\u4e0b\u5217\u5916\u639b\u6703\u53d7\u5230\u5f71\u97ff\:
 coreWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7a0b\u5f0f\u662f\u70ba Jenkins {0} \u4e4b\u5f8c\u7684\u7248\u672c\u8a2d\u8a08\u3002\u5728\u60a8\u76ee\u524d\u7684 Jenkins \u4e0d\u898b\u5f97\u53ef\u4ee5\u6b63\u5e38\u904b\u4f5c\u3002
-javaWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7a0b\u5f0f\u9700\u8981 Java {0} \u6216\u66f4\u65b0\u7248\u672c\u3002\u5728\u60a8\u76ee\u524d\u7684 Jenkins \u4e0d\u898b\u5f97\u53ef\u4ee5\u6b63\u5e38\u904b\u4f5c\u3002
 depCompatWarning=\u8b66\u544a\: \u6b64\u5916\u639b\u9700\u8981\u66f4\u65b0\u76f8\u4f9d\u6027\u5916\u639b\uff0c\u4e14\u5176\u4e2d\u81f3\u5c11\u6709\u4e00\u500b\u4e0d\u76f8\u5bb9\u65bc\u76ee\u524d\u7248\u672c\u3002\u9019\u901a\u5e38\u662f\u56e0\u70ba\u5b83\u672c\u8eab\u7684\u884c\u70ba\u6a21\u5f0f\u6709\u66f4\u52d5\uff0c\u6216\u5b83\u7684\u8a2d\u5b9a\u503c\u683c\u5f0f\u4e0d\u540c\u65bc\u76ee\u524d\u7248\u672c\u3002\u4f7f\u7528\u6b64\u5916\u639b\u7684\u4f5c\u696d\u53ef\u80fd\u9700\u8981\u91cd\u65b0\u8a2d\u5b9a\u3002\u60a8\u53ef\u80fd\u5f97\u624b\u52d5\u9084\u539f\u820a\u8a2d\u5b9a\u503c\u624d\u80fd\u9084\u539f\u5230\u820a\u7248\u3002\u8a73\u60c5\u8acb\u53c3\u8003\u6b64\u5916\u639b\u7684\u767c\u884c\u8cc7\u8a0a\u3002
 depCoreWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7684\u76f8\u4f9d\u6027\u5916\u639b\u9700\u8981 Jenkins {0} \u6216\u66f4\u65b0\u7248\u672c\u3002Jenkins \u5c07\u6703\u62d2\u7d55\u8f09\u5165\u8a72\u76f8\u4f9d\u6027\u5916\u639b\uff0c\u9019\u6703\u5c0e\u81f4\u9019\u500b\u5916\u639b\u8f09\u5165\u5931\u6557\u3002
-depJavaWarning=\u8b66\u544a\: \u9019\u500b\u5916\u639b\u7684\u76f8\u4f9d\u6027\u5916\u639b\u9700\u8981 Java {0} \u6216\u66f4\u65b0\u7248\u672c\u3002Jenkins \u5c07\u6703\u62d2\u7d55\u8f09\u5165\u8a72\u76f8\u4f9d\u6027\u5916\u639b\uff0c\u9019\u6703\u5c0e\u81f4\u9019\u500b\u5916\u639b\u8f09\u5165\u5931\u6557\u3002
 securityWarning=\u8b66\u544a\: \u9019\u500b\u7248\u672c\u7684\u5916\u639b\u7528\u8d77\u4f86\u53ef\u80fd\u4e0d\u5b89\u5168\u3002\u8acb\u67e5\u770b\u4e0b\u5217\u5b89\u5168\u6027\u9808\u77e5\:
 ago={0}\u524d
 adoptThisPlugin=<strong>\u6b64\u5916\u639b\u958b\u653e\u8a8d\u990a\uff01</strong>\u6211\u5011\u6b63\u5728\u5c0b\u627e\u65b0\u7684\u7dad\u8b77\u8005\uff0c\u8acb\u9020\u8a2a <a href\="https\://www.jenkins.io/doc/developer/plugin-governance/adopt-a-plugin/" rel\="noopener noreferrer" target\="_blank">Adopt a Plugin</a> \u53d6\u5f97\u66f4\u591a\u8cc7\u8a0a\u3002
diff --git a/core/src/main/resources/jenkins/split-plugins.txt b/core/src/main/resources/jenkins/split-plugins.txt
index 823c851988cc..95aac78d69a5 100644
--- a/core/src/main/resources/jenkins/split-plugins.txt
+++ b/core/src/main/resources/jenkins/split-plugins.txt
@@ -1,6 +1,6 @@
 # See ClassicPluginStrategy.DETACHED_LIST. As of JENKINS-47634 also used by plugin-compat-tester.
 
-# Columns are: plugin ID, last core release still containing the plugin's functionality, plugin version that's implied, minimum Java specification version where to install the plugin
+# Columns are: plugin ID, last core release still containing the plugin's functionality, plugin version that's implied
 
 # Note that all split plugins between and including matrix-auth and jaxb incorrectly use the first
 # core release without the plugin's functionality when they should use the immediately prior release.
@@ -27,7 +27,7 @@ command-launcher 2.86 1.0
 jdk-tool 2.112 1.0
 
 # JENKINS-55681
-jaxb 2.163 2.3.0 11
+jaxb 2.163 2.3.0
 
 #JENKINS-43610 Split Trilead out from Core
 trilead-api 2.184 1.0.4
diff --git a/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java b/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java
index 3bd68814a7a2..afe87953a077 100644
--- a/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java
+++ b/core/src/test/java/jenkins/plugins/DetachedPluginsUtilTest.java
@@ -3,7 +3,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -13,7 +12,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
-import jenkins.util.java.JavaUtils;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
@@ -28,19 +26,13 @@ public void checkJaxb() {
 
         DetachedPluginsUtil.DetachedPlugin jaxb = plugins.get(0);
 
-        assertEquals(new VersionNumber("11"), jaxb.getMinimumJavaVersion());
-
         final List<String> detachedPlugins = mapToPluginShortName(DetachedPluginsUtil.getDetachedPlugins());
-        if (JavaUtils.isRunningWithJava8OrBelow()) {
-            assertThat(detachedPlugins, not(hasItem("jaxb")));
-        } else {
-            assertThat(detachedPlugins, hasItem("jaxb"));
+        assertThat(detachedPlugins, hasItem("jaxb"));
 
-            final List<DetachedPluginsUtil.DetachedPlugin> detachedPluginsSince2_161 =
-                    DetachedPluginsUtil.getDetachedPlugins(new VersionNumber("2.161"));
+        final List<DetachedPluginsUtil.DetachedPlugin> detachedPluginsSince2_161 =
+                DetachedPluginsUtil.getDetachedPlugins(new VersionNumber("2.161"));
 
-            assertThat(mapToPluginShortName(detachedPluginsSince2_161), hasItems("jaxb", "trilead-api"));
-        }
+        assertThat(mapToPluginShortName(detachedPluginsSince2_161), hasItems("jaxb", "trilead-api"));
     }
 
     private List<String> mapToPluginShortName(List<DetachedPluginsUtil.DetachedPlugin> detachedPlugins) {
diff --git a/test/src/test/java/hudson/model/UpdateSiteTest.java b/test/src/test/java/hudson/model/UpdateSiteTest.java
index 757adb58efdd..946e42df59ac 100644
--- a/test/src/test/java/hudson/model/UpdateSiteTest.java
+++ b/test/src/test/java/hudson/model/UpdateSiteTest.java
@@ -25,11 +25,9 @@
 package hudson.model;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 import hudson.PluginWrapper;
 import hudson.model.UpdateSite.Data;
@@ -61,7 +59,6 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 
 public class UpdateSiteTest {
@@ -174,36 +171,6 @@ public void shutdownWebserver() throws Exception {
         assertNotEquals("plugin data is present", Collections.emptyMap(), site.getData().plugins);
     }
 
-    @Issue("JENKINS-56477")
-    @Test
-    public void isPluginUpdateCompatible() throws Exception {
-        UpdateSite site = getUpdateSite("/plugins/minJavaVersion-update-center.json");
-        final UpdateSite.Plugin tasksPlugin = site.getPlugin("tasks");
-        assertNotNull(tasksPlugin);
-        assertFalse(tasksPlugin.isNeededDependenciesForNewerJava());
-        assertFalse(tasksPlugin.isForNewerJava());
-        assertTrue(tasksPlugin.isCompatible());
-    }
-
-    @Issue("JENKINS-55048")
-    @Test public void minimumJavaVersion() throws Exception {
-        UpdateSite site = getUpdateSite("/plugins/minJavaVersion-update-center.json");
-
-        final UpdateSite.Plugin tasksPlugin = site.getPlugin("tasks");
-        assertNotNull(tasksPlugin);
-        assertFalse(tasksPlugin.isNeededDependenciesForNewerJava());
-        assertFalse(tasksPlugin.isForNewerJava());
-
-        final UpdateSite.Plugin pluginCompiledForTooRecentJava = site.getPlugin("java-too-recent");
-        assertFalse(pluginCompiledForTooRecentJava.isNeededDependenciesForNewerJava());
-        assertTrue(pluginCompiledForTooRecentJava.isForNewerJava());
-
-        final UpdateSite.Plugin pluginDependingOnPluginCompiledForTooRecentJava = site.getPlugin("depending-on-too-recent-java");
-        assertTrue(pluginDependingOnPluginCompiledForTooRecentJava.isNeededDependenciesForNewerJava());
-        assertFalse(pluginDependingOnPluginCompiledForTooRecentJava.isForNewerJava());
-
-    }
-
     @Test public void getAvailables() throws Exception {
         UpdateSite site = getUpdateSite("/plugins/available-update-center.json");
         List<UpdateSite.Plugin> available = site.getAvailables();
diff --git a/test/src/test/resources/plugins/minJavaVersion-update-center.json b/test/src/test/resources/plugins/minJavaVersion-update-center.json
deleted file mode 100644
index 05a9e188b906..000000000000
--- a/test/src/test/resources/plugins/minJavaVersion-update-center.json
+++ /dev/null
@@ -1,57 +0,0 @@
-updateCenter.post(
-{"connectionCheckUrl":"http://www.google.com/",
-    "core": {
-        "buildDate": "Dec 31, 1969",
-        "name": "core",
-        "url": "jenkins.war",
-        "version": "23"
-    },
-    "id": "default",
-    "plugins": {
-        "tasks": {
-            "buildDate": "Dec 17, 2008",
-            "dependencies": [],
-            "developers": [{"name": "lokadm"}],
-            "excerpt": "   This plug-in scans for open tasks in a specified set of files in the project modules   and visualizes the results.  ",
-            "name": "tasks",
-            "requiredCore": "1.264",
-            "sha1": "wtzlciUKiMcg90H5CTYkGX6+r8Y=",
-            "title": "Jenkins Task Scanner Plug-in",
-            "url": "tasks.jpi",
-            "version": "2.23"
-        },
-        "java-too-recent": {
-            "buildDate": "Dec 17, 2008",
-            "dependencies": [],
-            "developers": [],
-            "excerpt": "…",
-            "name": "dummy",
-            "requiredCore": "1.100",
-            "sha1": "wtzlcjUKiMcg90H5CTYkGX6+r8Y=",
-            "title": "Dummy",
-            "url": "http://nowhere.net/dummy.hpi",
-            "version": "1.0",
-            "minimumJavaVersion": "25"
-        },
-        "depending-on-too-recent-java": {
-            "buildDate": "Dec 17, 2008",
-            "dependencies": [
-                {
-                    "name": "java-too-recent",
-                    "optional": false,
-                    "version":"1.0"
-                }
-            ],
-            "developers": [{"name": "lokadm"}],
-            "excerpt": "   This plug-in scans for open tasks in a specified set of files in the project modules   and visualizes the results.  ",
-            "name": "tasks",
-            "requiredCore": "1.264",
-            "sha1": "wtzlciUKiMcg90H5CTYkGX6+r8Y=",
-            "title": "Jenkins Task Scanner Plug-in",
-            "url": "tasks.jpi",
-            "version": "2.23"
-        }
-    },
-    "updateCenterVersion": 1
-}
-);
diff --git a/war/src/main/js/templates/plugin-manager/available.hbs b/war/src/main/js/templates/plugin-manager/available.hbs
index ea276ffe62ad..7d276ea377d5 100644
--- a/war/src/main/js/templates/plugin-manager/available.hbs
+++ b/war/src/main/js/templates/plugin-manager/available.hbs
@@ -35,11 +35,6 @@
                     {{{ this.newerCoreRequired }}}
                 </div>
             {{/if}}
-            {{#if this.dependenciesNewerJava }}
-                <div class="alert alert-danger">
-                    {{{ this.dependenciesNewerJava }}}
-                </div>
-            {{/if}}
             {{#if this.unresolvedSecurityWarnings }}
                 <div class="alert alert-danger">
                     {{ this.unresolvedSecurityWarnings.text }}

From 5929a5488b24aac5df2871a3627cf69a68f571ac Mon Sep 17 00:00:00 2001
From: Adrien Lecharpentier <adrien.lecharpentier@gmail.com>
Date: Wed, 11 May 2022 18:02:56 +0200
Subject: [PATCH 06/16] [JENKINS-68296] Restore actions icon lookup with size
 (#6556)

---
 core/src/main/resources/lib/hudson/actions.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/hudson/actions.jelly b/core/src/main/resources/lib/hudson/actions.jelly
index bd8c6a1b7228..52c51eabdff1 100644
--- a/core/src/main/resources/lib/hudson/actions.jelly
+++ b/core/src/main/resources/lib/hudson/actions.jelly
@@ -37,7 +37,7 @@ THE SOFTWARE.
       the action object itself is available in the 'action' variable
     -->
     <st:include page="action.jelly" from="${action}" optional="true">
-      <j:set var="icon" value="${action.iconClassName != null ? action.iconClassName : action.iconFileName}"/>
+      <j:set var="icon" value="${action.iconClassName != null ? action.iconClassName + ' icon-md' : action.iconFileName}"/>
       <j:if test="${icon!=null}">
         <j:choose>
           <j:when test="${h.getActionUrl(it.url,action).contains('pollingLog')}">

From f5eee7dcb4783cf9d6469ee17aae31acb5962885 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 11 May 2022 10:08:07 -0700
Subject: [PATCH 07/16] Move Checkstyle configuration to a separate file
 (#6552)

---
 pom.xml                                     | 152 +-------------------
 src/checkstyle/checkstyle-configuration.xml | 150 +++++++++++++++++++
 2 files changed, 151 insertions(+), 151 deletions(-)
 create mode 100644 src/checkstyle/checkstyle-configuration.xml

diff --git a/pom.xml b/pom.xml
index 5f795a6b8ab9..1a4a24f983cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -399,157 +399,7 @@ THE SOFTWARE.
           <configuration>
             <consoleOutput>true</consoleOutput>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <!-- define here because checkstyle and multi module is a PITA -->
-            <checkstyleRules>
-              <module name="Checker">
-                <module name="UniqueProperties" />
-                <module name="FileTabCharacter">
-                  <property name="eachLine" value="true" />
-                </module>
-                <module name="LineLength">
-                  <property name="fileExtensions" value="java" />
-                  <property name="max" value="240" />
-                  <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://" />
-                </module>
-                <module name="TreeWalker">
-                  <!--
-                    Annotations: https://checkstyle.sourceforge.io/config_annotation.html
-                  -->
-                  <module name="AnnotationUseStyle" />
-                  <module name="MissingDeprecated" />
-                  <module name="MissingOverride" />
-                  <!--
-                    Class Design: https://checkstyle.sourceforge.io/config_design.html
-                  -->
-                  <module name="OneTopLevelClass" />
-                  <!--
-                    Coding: https://checkstyle.sourceforge.io/config_coding.html
-                  -->
-                  <module name="ArrayTrailingComma" />
-                  <module name="AvoidNoArgumentSuperConstructorCall" />
-                  <module name="CovariantEquals" />
-                  <module name="DefaultComesLast" />
-                  <module name="EqualsHashCode" />
-                  <module name="MissingSwitchDefault" />
-                  <module name="NoEnumTrailingComma" />
-                  <module name="OneStatementPerLine" />
-                  <module name="PackageDeclaration" />
-                  <module name="RequireThis" />
-                  <module name="SimplifyBooleanExpression" />
-                  <module name="StringLiteralEquality" />
-                  <module name="SuperClone" />
-                  <module name="SuperFinalize" />
-                  <module name="UnnecessarySemicolonAfterOuterTypeDeclaration" />
-                  <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
-                  <module name="UnnecessarySemicolonInEnumeration" />
-                  <module name="UnnecessarySemicolonInTryWithResources" />
-                  <module name="VariableDeclarationUsageDistance">
-                    <property name="allowedDistance" value="10" />
-                  </module>
-                  <!--
-                    Imports: https://checkstyle.sourceforge.io/config_imports.html
-                  -->
-                  <module name="AvoidStarImport" />
-                  <module name="CustomImportOrder">
-                    <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE" />
-                    <property name="sortImportsInGroupAlphabetically" value="true" />
-                    <property name="separateLineBetweenGroups" value="true" />
-                  </module>
-                  <module name="IllegalImport">
-                    <!-- prevent the use of jsr-305 annotations and Spring utilities -->
-                    <property name="illegalClasses" value="javax.annotation.MatchesPattern.Checker, javax.annotation.Nonnegative.Checker, javax.annotation.Nonnull.Checker, javax.annotation.RegEx.Checker, javax.annotation.CheckForNull, javax.annotation.CheckForSigned, javax.annotation.CheckReturnValue, javax.annotation.Detainted, javax.annotation.MatchesPattern, javax.annotation.Nonnegative, javax.annotation.Nonnull, javax.annotation.Nullable, javax.annotation.OverridingMethodsMustInvokeSuper, javax.annotation.ParametersAreNonnullByDefault, javax.annotation.ParametersAreNullableByDefault, javax.annotation.PropertyKey, javax.annotation.RegEx, javax.annotation.Signed, javax.annotation.Syntax, javax.annotation.Tainted, javax.annotation.Untainted, javax.annotation.WillClose, javax.annotation.WillCloseWhenClosed, javax.annotation.WillNotClose, javax.annotation.concurrent.GuardedBy, javax.annotation.concurrent.Immutable, javax.annotation.concurrent.NotThreadSafe, javax.annotation.concurrent.ThreadSafe, javax.annotation.meta.TypeQualifierValidator, javax.annotation.meta.When, javax.annotation.meta.Exclusive, javax.annotation.meta.Exhaustive, javax.annotation.meta.TypeQualifier, javax.annotation.meta.TypeQualifierDefault, javax.annotation.meta.TypeQualifierNickname, org.springframework.util.Assert, org.springframework.util.StringUtils" />
-                    <!-- Prevent the expansion of Guava usages and ban internal library packages -->
-                    <property name="illegalPkgs" value="com.google.common.base, com.google.common.escape, com.google.common.eventbus, com.google.common.graph, com.google.common.hash, com.google.common.html, com.google.common.io, com.google.common.math, com.google.common.net, com.google.common.primitives, com.google.common.reflect, com.google.common.xml, com.google.thirdparty, jline.internal" />
-                  </module>
-                  <module name="RedundantImport" />
-                  <module name="UnusedImports" />
-                  <!--
-                    Javadoc Comments: https://checkstyle.sourceforge.io/config_javadoc.html
-                  -->
-                  <module name="AtclauseOrder">
-                    <property name="tagOrder" value="@param, @return, @throws, @deprecated" />
-                  </module>
-                  <module name="InvalidJavadocPosition" />
-                  <module name="JavadocMethod">
-                    <property name="allowedAnnotations" value="Override, Test" />
-                    <property name="allowMissingParamTags" value="true" />
-                    <property name="allowMissingReturnTag" value="true" />
-                  </module>
-                  <module name="JavadocMissingWhitespaceAfterAsterisk" />
-                  <module name="NonEmptyAtclauseDescription" />
-                  <!--
-                    Miscellaneous: https://checkstyle.sourceforge.io/config_misc.html
-                  -->
-                  <module name="ArrayTypeStyle" />
-                  <module name="OuterTypeFilename" />
-                  <module name="UpperEll" />
-                  <!--
-                    Modifiers: https://checkstyle.sourceforge.io/config_modifier.html
-                  -->
-                  <module name="ModifierOrder" />
-                  <module name="RedundantModifier" />
-                  <!--
-                    Regexp: https://checkstyle.sourceforge.io/config_regexp.html
-                  -->
-                  <module name="Regexp">
-                    <property name="format" value="[ \t]+$" />
-                    <property name="illegalPattern" value="true" />
-                    <property name="message" value="Trailing whitespace" />
-                  </module>
-                  <!--
-                    Whitespace: https://checkstyle.sourceforge.io/config_whitespace.html
-                  -->
-                  <module name="EmptyLineSeparator">
-                    <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF" />
-                    <property name="allowNoEmptyLineBetweenFields" value="true" />
-                  </module>
-                  <module name="GenericWhitespace">
-                    <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace." />
-                    <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace." />
-                    <message key="ws.illegalFollow" value="GenericWhitespace ''{0}'' should followed by whitespace." />
-                    <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace." />
-                  </module>
-                  <module name="MethodParamPad">
-                    <property name="tokens" value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF, SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF" />
-                  </module>
-                  <module name="NoLineWrap">
-                    <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT" />
-                  </module>
-                  <module name="NoWhitespaceBefore">
-                    <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, LABELED_STAT, METHOD_REF" />
-                    <property name="allowLineBreaks" value="true" />
-                  </module>
-                  <module name="NoWhitespaceBeforeCaseDefaultColon" />
-                  <module name="ParenPad">
-                    <property name="tokens" value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF, EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL, METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA, RECORD_DEF" />
-                  </module>
-                  <module name="SeparatorWrap">
-                    <property name="id" value="SeparatorWrapComma" />
-                    <property name="tokens" value="COMMA" />
-                    <property name="option" value="EOL" />
-                  </module>
-                  <module name="SeparatorWrap">
-                    <property name="id" value="SeparatorWrapMethodRef" />
-                    <property name="tokens" value="METHOD_REF" />
-                    <property name="option" value="nl" />
-                  </module>
-                  <module name="WhitespaceAfter">
-                    <property name="tokens" value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE" />
-                  </module>
-                  <module name="WhitespaceAround">
-                    <property name="allowEmptyConstructors" value="true" />
-                    <property name="allowEmptyLambdas" value="true" />
-                    <property name="allowEmptyMethods" value="true" />
-                    <property name="allowEmptyTypes" value="true" />
-                    <property name="allowEmptyLoops" value="true" />
-                    <property name="ignoreEnhancedForColon" value="false" />
-                    <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND" />
-                    <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)" />
-                    <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace." />
-                  </module>
-                </module>
-              </module>
-            </checkstyleRules>
+            <configLocation>${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-configuration.xml</configLocation>
           </configuration>
           <dependencies>
             <dependency>
diff --git a/src/checkstyle/checkstyle-configuration.xml b/src/checkstyle/checkstyle-configuration.xml
new file mode 100644
index 000000000000..5ad876ef8bdb
--- /dev/null
+++ b/src/checkstyle/checkstyle-configuration.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <module name="UniqueProperties"/>
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+  <module name="LineLength">
+    <property name="fileExtensions" value="java"/>
+    <property name="max" value="240"/>
+    <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+  </module>
+  <module name="TreeWalker">
+    <!--
+      Annotations: https://checkstyle.sourceforge.io/config_annotation.html
+    -->
+    <module name="AnnotationUseStyle"/>
+    <module name="MissingDeprecated"/>
+    <module name="MissingOverride"/>
+    <!--
+      Class Design: https://checkstyle.sourceforge.io/config_design.html
+    -->
+    <module name="OneTopLevelClass"/>
+    <!--
+      Coding: https://checkstyle.sourceforge.io/config_coding.html
+    -->
+    <module name="ArrayTrailingComma"/>
+    <module name="AvoidNoArgumentSuperConstructorCall"/>
+    <module name="CovariantEquals"/>
+    <module name="DefaultComesLast"/>
+    <module name="EqualsHashCode"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="NoEnumTrailingComma"/>
+    <module name="OneStatementPerLine"/>
+    <module name="PackageDeclaration"/>
+    <module name="RequireThis"/>
+    <module name="SimplifyBooleanExpression"/>
+    <module name="StringLiteralEquality"/>
+    <module name="SuperClone"/>
+    <module name="SuperFinalize"/>
+    <module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
+    <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
+    <module name="UnnecessarySemicolonInEnumeration"/>
+    <module name="UnnecessarySemicolonInTryWithResources"/>
+    <module name="VariableDeclarationUsageDistance">
+      <property name="allowedDistance" value="10"/>
+    </module>
+    <!--
+      Imports: https://checkstyle.sourceforge.io/config_imports.html
+    -->
+    <module name="AvoidStarImport"/>
+    <module name="CustomImportOrder">
+      <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+      <property name="sortImportsInGroupAlphabetically" value="true"/>
+      <property name="separateLineBetweenGroups" value="true"/>
+    </module>
+    <module name="IllegalImport">
+      <!-- prevent the use of jsr-305 annotations and Spring utilities -->
+      <property name="illegalClasses" value="javax.annotation.MatchesPattern.Checker, javax.annotation.Nonnegative.Checker, javax.annotation.Nonnull.Checker, javax.annotation.RegEx.Checker, javax.annotation.CheckForNull, javax.annotation.CheckForSigned, javax.annotation.CheckReturnValue, javax.annotation.Detainted, javax.annotation.MatchesPattern, javax.annotation.Nonnegative, javax.annotation.Nonnull, javax.annotation.Nullable, javax.annotation.OverridingMethodsMustInvokeSuper, javax.annotation.ParametersAreNonnullByDefault, javax.annotation.ParametersAreNullableByDefault, javax.annotation.PropertyKey, javax.annotation.RegEx, javax.annotation.Signed, javax.annotation.Syntax, javax.annotation.Tainted, javax.annotation.Untainted, javax.annotation.WillClose, javax.annotation.WillCloseWhenClosed, javax.annotation.WillNotClose, javax.annotation.concurrent.GuardedBy, javax.annotation.concurrent.Immutable, javax.annotation.concurrent.NotThreadSafe, javax.annotation.concurrent.ThreadSafe, javax.annotation.meta.TypeQualifierValidator, javax.annotation.meta.When, javax.annotation.meta.Exclusive, javax.annotation.meta.Exhaustive, javax.annotation.meta.TypeQualifier, javax.annotation.meta.TypeQualifierDefault, javax.annotation.meta.TypeQualifierNickname, org.springframework.util.Assert, org.springframework.util.StringUtils"/>
+      <!-- Prevent the expansion of Guava usages and ban internal library packages -->
+      <property name="illegalPkgs" value="com.google.common.base, com.google.common.escape, com.google.common.eventbus, com.google.common.graph, com.google.common.hash, com.google.common.html, com.google.common.io, com.google.common.math, com.google.common.net, com.google.common.primitives, com.google.common.reflect, com.google.common.xml, com.google.thirdparty, jline.internal"/>
+    </module>
+    <module name="RedundantImport"/>
+    <module name="UnusedImports"/>
+    <!--
+      Javadoc Comments: https://checkstyle.sourceforge.io/config_javadoc.html
+    -->
+    <module name="AtclauseOrder">
+      <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+    </module>
+    <module name="InvalidJavadocPosition"/>
+    <module name="JavadocMethod">
+      <property name="allowedAnnotations" value="Override, Test"/>
+      <property name="allowMissingParamTags" value="true"/>
+      <property name="allowMissingReturnTag" value="true"/>
+    </module>
+    <module name="JavadocMissingWhitespaceAfterAsterisk"/>
+    <module name="NonEmptyAtclauseDescription"/>
+    <!--
+      Miscellaneous: https://checkstyle.sourceforge.io/config_misc.html
+    -->
+    <module name="ArrayTypeStyle"/>
+    <module name="OuterTypeFilename"/>
+    <module name="UpperEll"/>
+    <!--
+      Modifiers: https://checkstyle.sourceforge.io/config_modifier.html
+    -->
+    <module name="ModifierOrder"/>
+    <module name="RedundantModifier"/>
+    <!--
+      Regexp: https://checkstyle.sourceforge.io/config_regexp.html
+    -->
+    <module name="Regexp">
+      <property name="format" value="[ \t]+$"/>
+      <property name="illegalPattern" value="true"/>
+      <property name="message" value="Trailing whitespace"/>
+    </module>
+    <!--
+      Whitespace: https://checkstyle.sourceforge.io/config_whitespace.html
+    -->
+    <module name="EmptyLineSeparator">
+      <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF"/>
+      <property name="allowNoEmptyLineBetweenFields" value="true"/>
+    </module>
+    <module name="GenericWhitespace">
+      <message key="ws.followed" value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+      <message key="ws.preceded" value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+      <message key="ws.illegalFollow" value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+      <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+    </module>
+    <module name="MethodParamPad">
+      <property name="tokens" value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF, SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
+    </module>
+    <module name="NoLineWrap">
+      <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
+    </module>
+    <module name="NoWhitespaceBefore">
+      <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, DOT, LABELED_STAT, METHOD_REF"/>
+      <property name="allowLineBreaks" value="true"/>
+    </module>
+    <module name="NoWhitespaceBeforeCaseDefaultColon"/>
+    <module name="ParenPad">
+      <property name="tokens" value="ANNOTATION, ANNOTATION_FIELD_DEF, CTOR_CALL, CTOR_DEF, DOT, ENUM_CONSTANT_DEF, EXPR, LITERAL_CATCH, LITERAL_DO, LITERAL_FOR, LITERAL_IF, LITERAL_NEW, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL, METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA, RECORD_DEF"/>
+    </module>
+    <module name="SeparatorWrap">
+      <property name="id" value="SeparatorWrapComma"/>
+      <property name="tokens" value="COMMA"/>
+      <property name="option" value="EOL"/>
+    </module>
+    <module name="SeparatorWrap">
+      <property name="id" value="SeparatorWrapMethodRef"/>
+      <property name="tokens" value="METHOD_REF"/>
+      <property name="option" value="nl"/>
+    </module>
+    <module name="WhitespaceAfter">
+      <property name="tokens" value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE, LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE"/>
+    </module>
+    <module name="WhitespaceAround">
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyLambdas" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyTypes" value="true"/>
+      <property name="allowEmptyLoops" value="true"/>
+      <property name="ignoreEnhancedForColon" value="false"/>
+      <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, LCURLY, LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT, TYPE_EXTENSION_AND"/>
+      <message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+      <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+    </module>
+  </module>
+</module>

From 23c5cee13ce3bd79e021af301500c1f4f823a37e Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Thu, 12 May 2022 08:54:39 -0700
Subject: [PATCH 08/16] [JENKINS-68492] `javadoc:javadoc` can no longer be
 executed with `install` (#6560)

---
 pom.xml                                    | 1 +
 src/checkstyle/checkstyle-suppressions.xml | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 src/checkstyle/checkstyle-suppressions.xml

diff --git a/pom.xml b/pom.xml
index 1a4a24f983cf..4c14da242dea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -400,6 +400,7 @@ THE SOFTWARE.
             <consoleOutput>true</consoleOutput>
             <includeTestSourceDirectory>true</includeTestSourceDirectory>
             <configLocation>${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-configuration.xml</configLocation>
+            <suppressionsLocation>${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
           </configuration>
           <dependencies>
             <dependency>
diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
new file mode 100644
index 000000000000..6699de930d0a
--- /dev/null
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC "-//Checkstyle//DTD SuppressionFilter Configuration 1.0//EN" "https://checkstyle.org/dtds/suppressions_1_0.dtd">
+<suppressions>
+  <suppress checks=".*" files="[/\\]generated-sources[/\\]"/>
+  <suppress checks=".*" files="[/\\]generated-test-sources[/\\]"/>
+</suppressions>

From f2a396933ce8d6b59ba01c538f5a28220f7c2c31 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Thu, 12 May 2022 10:40:24 -0600
Subject: [PATCH 09/16] [JENKINS-68200] Winstone 5.25 - Bump Jetty from
 9.4.45.v20220203 to 9.4.46.v20220331 (#6558)

---
 war/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/war/pom.xml b/war/pom.xml
index dcdf9ebb993c..bf000697debd 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -162,7 +162,7 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci</groupId>
       <artifactId>winstone</artifactId>
       <!-- Make sure to keep jetty-maven-plugin elsewhere in this file in sync with the Jetty release in Winstone -->
-      <version>5.24</version>
+      <version>5.25</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -509,7 +509,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.4.45.v20220203</version>
+        <version>9.4.46.v20220331</version>
         <configuration>
           <!--
             Reload webapp when you hit ENTER. (See JETTY-282 for more)

From 62d42601f43ad2285c3cd22ed616d89580338946 Mon Sep 17 00:00:00 2001
From: Langer0416 <71805759+Langer0416@users.noreply.github.com>
Date: Fri, 13 May 2022 04:20:39 +0800
Subject: [PATCH 10/16] [JENKINS-68430] Underlined space in build executor
 status view (#6554)

---
 core/src/main/resources/lib/hudson/executors.jelly | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/resources/lib/hudson/executors.jelly b/core/src/main/resources/lib/hudson/executors.jelly
index fa8b46fa2b48..ba340832d333 100644
--- a/core/src/main/resources/lib/hudson/executors.jelly
+++ b/core/src/main/resources/lib/hudson/executors.jelly
@@ -34,7 +34,9 @@ THE SOFTWARE.
   <d:taglib uri="local">
     <d:tag name="computerCaption">
 
-      <a href="${rootURL}/${c.url}" class="jenkins-link--with-icon model-link inside"><l:icon src="${c.iconClassName}" alt="${altText}"/><st:nbsp/>${title}</a>
+      <a href="${rootURL}/${c.url}" class="jenkins-link--with-icon model-link inside"><l:icon src="${c.iconClassName}" alt="${altText}"/>
+        <span style="margin-left: 1ch;">${title}</span>
+      </a>
       <span style="float: right; font-weight: normal;">
         <j:if test="${c.offline}">
           <j:choose>

From 99e41bad3a4cfede4050a05776ad1d4255a8e86d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 14:12:10 -0700
Subject: [PATCH 11/16] Bump Stapler from 1669.v95a_4b_919a_b_a_2 to
 1685.v3b_5035c4ce05 (#6553)

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

diff --git a/bom/pom.xml b/bom/pom.xml
index cf75ee27e20e..2e88bea0f902 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -40,7 +40,7 @@ THE SOFTWARE.
   <properties>
     <asm.version>9.3</asm.version>
     <slf4jVersion>1.7.36</slf4jVersion>
-    <stapler.version>1669.v95a_4b_919a_b_a_2</stapler.version>
+    <stapler.version>1685.v3b_5035c4ce05</stapler.version>
     <groovy.version>2.4.21</groovy.version>
   </properties>
 

From 216e7544c33423176759bd225f2706b498488711 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Thu, 12 May 2022 17:12:29 -0400
Subject: [PATCH 12/16] Suppress more stack traces from
 `DefaultJnlpSlaveReceiver.channelClosed` (#6555)

---
 .../src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
index dbe60372e961..f130fdf27a73 100644
--- a/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
+++ b/core/src/main/java/jenkins/slaves/DefaultJnlpSlaveReceiver.java
@@ -9,6 +9,7 @@
 import hudson.model.Computer;
 import hudson.model.Slave;
 import hudson.remoting.Channel;
+import hudson.remoting.ChannelClosedException;
 import hudson.slaves.ComputerLauncher;
 import hudson.slaves.ComputerLauncherFilter;
 import hudson.slaves.DelegatingComputerLauncher;
@@ -188,7 +189,7 @@ public void afterChannel(@NonNull JnlpConnectionState event) {
     public void channelClosed(@NonNull JnlpConnectionState event) {
         final String nodeName = event.getProperty(JnlpConnectionState.CLIENT_NAME_KEY);
         IOException cause = event.getCloseCause();
-        if (cause instanceof ClosedChannelException) {
+        if (cause instanceof ClosedChannelException || cause instanceof ChannelClosedException) {
             LOGGER.log(Level.INFO, "{0} for {1} terminated: {2}", new Object[] {Thread.currentThread().getName(), nodeName, cause});
         } else if (cause != null) {
             LOGGER.log(Level.WARNING, Thread.currentThread().getName() + " for " + nodeName + " terminated",

From d01a1074801ce68a54ae0389d21d739e92d30df1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 May 2022 14:13:01 -0700
Subject: [PATCH 13/16] Bump Spotless from 2.22.4 to 2.22.5 (#6561)

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

diff --git a/pom.xml b/pom.xml
index 4c14da242dea..cea4dc7c95dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.23</bridge-method-injector.version>
     <junit.jupiter.version>5.8.2</junit.jupiter.version>
     <mockito.version>4.5.1</mockito.version>
-    <spotless.version>2.22.4</spotless.version>
+    <spotless.version>2.22.5</spotless.version>
   </properties>
 
   <dependencyManagement>

From 5f9100286be16c434e973efc453a0b35ceee9342 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 13 May 2022 11:01:46 -0400
Subject: [PATCH 14/16] [JENKINS-51820] Removing Java Web Start support (#6543)

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
---
 bom/pom.xml                                   |  25 -------
 .../main/java/hudson/slaves/JNLPLauncher.java |  36 ++++------
 .../hudson/slaves/JNLPLauncher/config.jelly   |   3 -
 .../slaves/JNLPLauncher/help-vmargs.html      |   5 --
 .../slaves/JNLPLauncher/help-vmargs_bg.html   |   6 --
 .../slaves/JNLPLauncher/help-vmargs_fr.html   |   5 --
 .../slaves/JNLPLauncher/help-vmargs_it.html   |   6 --
 .../slaves/JNLPLauncher/help-vmargs_ja.html   |   4 --
 .../slaves/JNLPLauncher/help.properties       |  10 +--
 .../hudson/slaves/JNLPLauncher/main.jelly     |  44 +++---------
 .../SlaveComputer/jenkins-agent.jnlp.jelly    |  35 +---------
 .../jenkins/RemotingJarSignatureTest.java     |  46 -------------
 pom.xml                                       |   2 +-
 test/pom.xml                                  |   7 --
 .../java/hudson/slaves/JNLPLauncherTest.java  |  64 ++----------------
 .../jenkins/agents/WebSocketAgentsTest.java   |   3 +-
 war/pom.xml                                   |  20 ------
 war/src/main/webapp/images/webstart.gif       | Bin 1798 -> 0 bytes
 18 files changed, 35 insertions(+), 286 deletions(-)
 delete mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html
 delete mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_bg.html
 delete mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_fr.html
 delete mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_it.html
 delete mode 100644 core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_ja.html
 delete mode 100644 core/src/test/java/jenkins/RemotingJarSignatureTest.java
 delete mode 100644 war/src/main/webapp/images/webstart.gif

diff --git a/bom/pom.xml b/bom/pom.xml
index 2e88bea0f902..1f6c8cb3c555 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -261,31 +261,6 @@ THE SOFTWARE.
         <artifactId>instance-identity</artifactId>
         <version>2.2</version>
       </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.modules</groupId>
-        <artifactId>launchd-slave-installer</artifactId>
-        <version>1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.modules</groupId>
-        <artifactId>slave-installer</artifactId>
-        <version>1.7</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.modules</groupId>
-        <artifactId>systemd-slave-installer</artifactId>
-        <version>1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.modules</groupId>
-        <artifactId>upstart-slave-installer</artifactId>
-        <version>1.1</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.modules</groupId>
-        <artifactId>windows-slave-installer</artifactId>
-        <version>2.0</version>
-      </dependency>
       <dependency>
         <groupId>org.jfree</groupId>
         <artifactId>jfreechart</artifactId>
diff --git a/core/src/main/java/hudson/slaves/JNLPLauncher.java b/core/src/main/java/hudson/slaves/JNLPLauncher.java
index f549e6acb78d..1098769b8146 100644
--- a/core/src/main/java/hudson/slaves/JNLPLauncher.java
+++ b/core/src/main/java/hudson/slaves/JNLPLauncher.java
@@ -36,7 +36,6 @@
 import jenkins.model.Jenkins;
 import jenkins.slaves.RemotingWorkDirSettings;
 import jenkins.util.SystemProperties;
-import jenkins.util.java.JavaUtils;
 import jenkins.websocket.WebSockets;
 import org.jenkinsci.Symbol;
 import org.kohsuke.accmod.Restricted;
@@ -67,11 +66,10 @@ public class JNLPLauncher extends ComputerLauncher {
     public final String tunnel;
 
     /**
-     * Additional JVM arguments. Can be null.
-     * @since 1.297
+     * @deprecated No longer used.
      */
-    @CheckForNull
-    public final String vmargs;
+    @Deprecated
+    public final transient String vmargs = null;
 
     @NonNull
     private RemotingWorkDirSettings workDirSettings = RemotingWorkDirSettings.getEnabledDefaults();
@@ -103,10 +101,20 @@ public JNLPLauncher(@CheckForNull String tunnel, @CheckForNull String vmargs, @C
         }
     }
 
+    // TODO cannot easily make tunnel into a @DataBoundSetter because then the @DataBoundConstructor would be on a no-arg constructor
+    // which is already defined and deprecated. Could retroactively let no-arg constructor use default for workDirSettings,
+    // which would be a behavioral change only for callers of the Java constructor (unlikely).
     @DataBoundConstructor
+    public JNLPLauncher(@CheckForNull String tunnel) {
+        this.tunnel = Util.fixEmptyAndTrim(tunnel);
+    }
+
+    /**
+     * @deprecated use {@link JNLPLauncher#JNLPLauncher(String)}
+     */
+    @Deprecated
     public JNLPLauncher(@CheckForNull String tunnel, @CheckForNull String vmargs) {
         this.tunnel = Util.fixEmptyAndTrim(tunnel);
-        this.vmargs = Util.fixEmptyAndTrim(vmargs);
     }
 
     /**
@@ -249,22 +257,6 @@ public FormValidation doCheckWebSocket(@QueryParameter boolean webSocket, @Query
 
     }
 
-    /**
-     * Returns true if Java Web Start button should be displayed.
-     * Java Web Start is only supported when the Jenkins server is
-     * running with Java 8.  Earlier Java versions are not supported by Jenkins.
-     * Later Java versions do not support Java Web Start.
-     *
-     * This flag is checked in {@code config.jelly} before displaying the
-     * Java Web Start button.
-     * @return {@code true} if Java Web Start button should be displayed.
-     * @since 2.153
-     */
-    @Restricted(NoExternalUse.class) // Jelly use
-    public boolean isJavaWebStartSupported() {
-        return JavaUtils.isRunningWithJava8OrBelow();
-    }
-
     /**
      * Overrides the url that inbound TCP agents should connect to
      * as advertised in the agent.jnlp file. If not set, the default
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly
index 6b33de6b8068..773a2ca0737b 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/config.jelly
@@ -35,8 +35,5 @@ THE SOFTWARE.
     <f:entry title="${%Tunnel connection through}" help="/help/system-config/master-slave/jnlp-tunnel.html">
       <f:textbox field="tunnel"/>
     </f:entry>
-    <f:entry title="${%JVM options}" field="vmargs">
-      <f:textbox />
-    </f:entry>
   </f:advanced>
 </j:jelly>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html
deleted file mode 100644
index 2a398539e66e..000000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-    If the agent JVM should be launched with additional VM arguments, such as "-Xmx256m",
-    specify those here. List of all the options are available
-    <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/unix/java.html">here</a>.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_bg.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_bg.html
deleted file mode 100644
index 551c5cbb746b..000000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_bg.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    При необходимост тук попълнете допълнителните аргументи за стартирането на
-    виртуалната машина на Java на подчинените компютри като „-Xmx256m“.
-    Погледнете документацията за
-    <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/unix/java.html">пълния списък</a>.
-</div>
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_fr.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_fr.html
deleted file mode 100644
index ef2647a6259d..000000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_fr.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div>
-    Si la JVM agent doit être lancée avec des arguments supplémentaires, comme "-Xmx256m",
-    indiquez-les ici. La liste de toutes options disponibles est disponible
-    <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/unix/java.html">ici</a>.
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_it.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_it.html
deleted file mode 100644
index 9dcbbe93bb20..000000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_it.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div>
-    Se la JVM dell'agente deve essere avviata con argomenti VM aggiuntivi,
-    come "-Xmx256m", specificarli qui. Un elenco con tutte le opzioni è
-    disponibile
-    <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/unix/java.html">qui</a>.
-</div>
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_ja.html b/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_ja.html
deleted file mode 100644
index 3356babf6f98..000000000000
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help-vmargs_ja.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div>
-    エージェントのJVMに"-Xmx256m"のようなオプションをつけて起動する必要があるなら、ここで指定します。
-    <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/unix/java.html">利用可能なオプションの一覧</a>を参照してください。
-</div>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties
index d49d20b0ed01..493aa5437375 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/help.properties
@@ -22,13 +22,9 @@
 
 blurb=\
   Allows an agent to be connected to the Jenkins controller whenever it is ready.<br>\
-  In one mode, <a href="https://en.wikipedia.org/wiki/Java_Web_Start" rel="noopener noreferrer" target="_blank">Java Web Start</a> is used. \
-  In this case, a JNLP file must be opened on the agent machine, \
-  which will establish a TCP connection to the Jenkins controller. \
-  (Other launch methods use a JNLP file but not Java Web Start, or do not use a JNLP file at all.)<br>\
+  The agent machine will establish a TCP connection to the Jenkins controller. \
   This means that the agent need not be reachable from the controller; \
   the agent just needs to be able to reach the controller. \
   If you have enabled security via the <i>Configure Global Security</i> page, \
-  you can customize the port on which the Jenkins controller will listen for incoming agent connections.<br>\
-  By default, the agent will launch a GUI, but it is also possible to run \
-  an agent without a GUI, for example as a Windows service.
+  you can customize the port on which the Jenkins controller will listen for incoming agent connections \
+  (unnecessary when using WebSocket mode).
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
index 468192e4be7b..a31298a13ace 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
@@ -33,58 +33,30 @@ THE SOFTWARE.
     </j:when>
     <j:when test="${it.offline and !it.temporarilyOffline}">
       <j:if test="${h.hasPermission(it, it.CONNECT)}">
-        <p>
-          ${%Connect agent to Jenkins one of these ways:}
-        </p>
-        <ul>
-          <j:if test="${it.launcher.javaWebStartSupported}">
-            <li>
-              <p>
-                <a href="jenkins-agent.jnlp" id="jnlp-link">
-                  <img src="${imagesURL}/webstart.gif" alt="${%launch agent}" />
-                </a>
-                ${%Launch agent from browser}
-              </p>
-            </li>
-          </j:if>
+          <j:set var="jenkinsURL" value="${h.inferHudsonURL(request)}"/>
           <j:choose>
             <j:when test="${it.ACL.hasPermission(app.ANONYMOUS, it.CONNECT)}">
-              <li>
                 <p>
                   ${%Run from agent command line:}
                 </p>
-                <pre>javaws ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp</pre>
-              </li>
-              <li>
-                <p>
-                  ${%Or if the agent is headless:}
-                </p>
-                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp ${it.launcher.getWorkDirOptions(it)}</pre>
-              </li>
+                <pre>curl -sO ${jenkinsURL}jnlpJars/agent.jar
+java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp ${it.launcher.getWorkDirOptions(it)}</pre>
             </j:when>
             <j:otherwise>
-              <li>
                 <p>
                   ${%Run from agent command line:}
                 </p>
                 <!-- TODO conceal secret w/ JS if possible -->
-                <pre>java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp -secret ${it.jnlpMac} ${it.launcher.getWorkDirOptions(it)}</pre>
+                <pre>curl -sO ${jenkinsURL}jnlpJars/agent.jar
+java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret ${it.jnlpMac} ${it.launcher.getWorkDirOptions(it)}</pre>
                 <p>
-                  ${%Run from agent command line, with the secret stored in a file:}
+                  ${%Or run from agent command line, with the secret stored in a file:}
                 </p>
                 <pre>echo ${it.jnlpMac} > secret-file
-java${it.launcher.vmargs == null ? '' : ' ' + it.launcher.vmargs} -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${h.inferHudsonURL(request)}${it.url}jenkins-agent.jnlp -secret @secret-file ${it.launcher.getWorkDirOptions(it)}</pre>
-              </li>
+curl -sO ${jenkinsURL}jnlpJars/agent.jar
+java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret @secret-file ${it.launcher.getWorkDirOptions(it)}</pre>
             </j:otherwise>
           </j:choose>
-        </ul>
-        <!--
-        <p>
-          <a href="custom-jnlp" style="margin-left:3em">
-            (tweak launch parameters)
-          </a>
-        </p>
-        -->
       </j:if>
     </j:when>
     <j:otherwise>
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/jenkins-agent.jnlp.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/jenkins-agent.jnlp.jelly
index 22b7a562448e..e8053df3cedd 100644
--- a/core/src/main/resources/hudson/slaves/SlaveComputer/jenkins-agent.jnlp.jelly
+++ b/core/src/main/resources/hudson/slaves/SlaveComputer/jenkins-agent.jnlp.jelly
@@ -27,40 +27,11 @@ THE SOFTWARE.
   <l:view contentType="application/x-java-jnlp-file">
   <j:invokeStatic var="rootURL" className="hudson.slaves.JNLPLauncher" method="getInboundAgentUrl" />
 
-  <!--
-    See https://www.dallaway.com/acad/webstart/ for obtaining the certificate.
-  -->
-
-    <!-- See https://docs.oracle.com/javase/8/docs/technotes/guides/javaws/developersguide/syntax.html for the syntax -->
-    <jnlp spec="1.0+"
-        codebase="${rootURL}computer/${h.encode(it.node.nodeName)}/">
-
-      <information>
-        <title>Agent for ${it.displayName}</title>
-        <vendor>Jenkins project</vendor>
-        <homepage href="https://jenkins-ci.org/"/>
-      </information>
-
-      <security>
-        <all-permissions/>
-      </security>
-
+    <!-- JavaWebStart is no longer supported, but a subset of the syntax is retained for compatibility reasons: hudson.remoting.Launcher.parseJnlpArguments -->
+    <jnlp>
       <j:set var="launcher" value="${it.delegatedLauncher}"/>
 
-      <resources>
-        <j:set var="port" value="${request.getParameter('debugPort')}"/>
-        <j:choose>
-          <j:when test="${port!=null}">
-            <j2se version="1.8+" java-vm-args="${launcher.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=${port}" />
-          </j:when>
-          <j:otherwise>
-            <j2se version="1.8+" java-vm-args="${launcher.vmargs}"/>
-          </j:otherwise>
-        </j:choose>
-        <jar href="${rootURL}jnlpJars/remoting.jar"/>
-      </resources>
-
-      <application-desc main-class="hudson.remoting.jnlp.Main">
+      <application-desc>
         <argument>${it.jnlpMac}</argument>
         <argument>${it.node.nodeName}</argument>
         <j:if test="${launcher.webSocket}">
diff --git a/core/src/test/java/jenkins/RemotingJarSignatureTest.java b/core/src/test/java/jenkins/RemotingJarSignatureTest.java
deleted file mode 100644
index a0d37e09a208..000000000000
--- a/core/src/test/java/jenkins/RemotingJarSignatureTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package jenkins;
-
-import static org.junit.Assert.assertNotNull;
-
-import hudson.remoting.Channel;
-import hudson.remoting.Which;
-import java.io.File;
-import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.NullOutputStream;
-import org.junit.Test;
-
-/**
- * @author Kohsuke Kawaguchi
- */
-public class RemotingJarSignatureTest {
-    /**
-     * Makes sure that the remoting jar is properly signed.
-     */
-    @Test
-    public void testSignature() throws Exception {
-        File jar = Which.jarFile(Channel.class);
-        System.out.println("Verifying " + jar);
-
-        JarFile myJar = new JarFile(jar, true);
-
-        Enumeration<JarEntry> entries = myJar.entries();
-        while (entries.hasMoreElements()) {
-            JarEntry entry = entries.nextElement();
-            if (entry.isDirectory())    continue;
-
-            // unsigned files that are related to signatures
-            String name = entry.getName();
-            if (name.equals("META-INF/MANIFEST.MF")) continue;
-            if (name.startsWith("META-INF/") && name.endsWith(".SF")) continue;
-            if (name.startsWith("META-INF/") && name.endsWith(".RSA")) continue;
-            if (name.startsWith("META-INF/") && name.endsWith(".DSA")) continue;
-
-            // make sure bits are signed
-            IOUtils.copy(myJar.getInputStream(entry), NullOutputStream.NULL_OUTPUT_STREAM);
-            assertNotNull("No signature for " + name, entry.getCodeSigners());
-        }
-    }
-}
diff --git a/pom.xml b/pom.xml
index cea4dc7c95dd..78ed55665897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@ THE SOFTWARE.
     <changelog.url>https://www.jenkins.io/changelog</changelog.url>
 
     <!-- Bundled Remoting version -->
-    <remoting.version>4.13</remoting.version>
+    <remoting.version>4.14</remoting.version>
     <!-- Minimum Remoting version, which is tested for API compatibility -->
     <remoting.minimum.supported.version>3.14</remoting.minimum.supported.version>
 
diff --git a/test/pom.xml b/test/pom.xml
index e47c401ef355..d65a26019650 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -178,13 +178,6 @@ THE SOFTWARE.
       <version>318.va_f3ccb_729b_71</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <!-- for testing JNLP launch. -->
-      <groupId>org.jvnet.hudson</groupId>
-      <artifactId>netx</artifactId>
-      <version>0.5-hudson-2</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
diff --git a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java
index f10e32060724..87378f6822ff 100644
--- a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java
+++ b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java
@@ -40,9 +40,9 @@
 import hudson.model.Node;
 import hudson.model.Node.Mode;
 import hudson.model.Slave;
+import hudson.remoting.Launcher;
 import hudson.remoting.Which;
 import hudson.util.ArgumentListBuilder;
-import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -50,8 +50,6 @@
 import java.util.logging.Level;
 import jenkins.security.SlaveToMasterCallable;
 import jenkins.slaves.RemotingWorkDirSettings;
-import netx.jnlp.runtime.JNLPRuntime;
-import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -60,7 +58,6 @@
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.LoggerRule;
 import org.jvnet.hudson.test.SmokeTest;
-import org.jvnet.hudson.test.TestExtension;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 /**
@@ -80,8 +77,6 @@ public class JNLPLauncherTest {
      */
     @Test
     public void testLaunch() throws Exception {
-        Assume.assumeFalse("Skipping JNLPLauncherTest.testLaunch because we are running headless", GraphicsEnvironment.isHeadless());
-
         Computer c = addTestAgent(false);
         launchJnlpAndVerify(c, buildJnlpArgs(c));
     }
@@ -92,7 +87,6 @@ public void testLaunch() throws Exception {
     @Test
     @Issue("JENKINS-39370")
     public void testLaunchWithWorkDir() throws Exception {
-        Assume.assumeFalse("Skipping JNLPLauncherTest.testLaunch because we are running headless", GraphicsEnvironment.isHeadless());
         File workDir = tmpDir.newFolder("workDir");
 
         Computer c = addTestAgent(false);
@@ -100,39 +94,6 @@ public void testLaunchWithWorkDir() throws Exception {
         assertTrue("Remoting work dir should have been created", new File(workDir, "remoting").exists());
     }
 
-    /**
-     * Tests the '-headless' option.
-     * (Although this test doesn't really assert that the agent really is running in a headless mode.)
-     */
-    @Test
-    public void testHeadlessLaunch() throws Exception {
-        Computer c = addTestAgent(false);
-        launchJnlpAndVerify(c, buildJnlpArgs(c).add("-arg", "-headless"));
-        // make sure that onOffline gets called just the right number of times
-        assertEquals(1, ComputerListener.all().get(ListenerImpl.class).offlined);
-    }
-
-    @Test
-    @Issue("JENKINS-44112")
-    public void testHeadlessLaunchWithWorkDir() throws Exception {
-        Assume.assumeFalse("Skipping JNLPLauncherTest.testLaunch because we are running headless", GraphicsEnvironment.isHeadless());
-
-        Computer c = addTestAgent(true);
-        launchJnlpAndVerify(c, buildJnlpArgs(c).add("-arg", "-headless"));
-        assertEquals(1, ComputerListener.all().get(ListenerImpl.class).offlined);
-    }
-
-    @Test
-    @Issue("JENKINS-39370")
-    public void testHeadlessLaunchWithCustomWorkDir() throws Exception {
-        Assume.assumeFalse("Skipping JNLPLauncherTest.testLaunch because we are running headless", GraphicsEnvironment.isHeadless());
-        File workDir = tmpDir.newFolder("workDir");
-
-        Computer c = addTestAgent(false);
-        launchJnlpAndVerify(c, buildJnlpArgs(c).add("-arg", "-headless", "-workDir", workDir.getAbsolutePath()));
-        assertEquals(1, ComputerListener.all().get(ListenerImpl.class).offlined);
-    }
-
     @Test
     @LocalData
     @Issue("JENKINS-44112")
@@ -160,7 +121,6 @@ public void testDefaults() {
     @Test
     @Issue("JENKINS-47056")
     public void testDelegatingComputerLauncher() throws Exception {
-        Assume.assumeFalse("Skipping JNLPLauncherTest.testDelegatingComputerLauncher because we are running headless", GraphicsEnvironment.isHeadless());
         File workDir = tmpDir.newFolder("workDir");
 
         ComputerLauncher launcher = new JNLPLauncher("", "", new RemotingWorkDirSettings(false, workDir.getAbsolutePath(), "internalDir", false));
@@ -173,7 +133,6 @@ public void testDelegatingComputerLauncher() throws Exception {
     @Test
     @Issue("JENKINS-47056")
     public void testComputerLauncherFilter() throws Exception {
-        Assume.assumeFalse("Skipping JNLPLauncherTest.testComputerLauncherFilter because we are running headless", GraphicsEnvironment.isHeadless());
         File workDir = tmpDir.newFolder("workDir");
 
         ComputerLauncher launcher = new JNLPLauncher("", "", new RemotingWorkDirSettings(false, workDir.getAbsolutePath(), "internalDir", false));
@@ -183,17 +142,6 @@ public void testComputerLauncherFilter() throws Exception {
         assertTrue("Remoting work dir should have been created", new File(workDir, "internalDir").exists());
     }
 
-    @TestExtension("testHeadlessLaunch")
-    public static class ListenerImpl extends ComputerListener {
-        int offlined = 0;
-
-        @Override
-        public void onOffline(Computer c) {
-            offlined++;
-            assertTrue(c.isOffline());
-        }
-    }
-
     private static class DelegatingComputerLauncherImpl extends DelegatingComputerLauncher {
         DelegatingComputerLauncherImpl(ComputerLauncher launcher) {
             super(launcher);
@@ -209,10 +157,8 @@ private static class ComputerLauncherFilterImpl extends ComputerLauncherFilter {
     private ArgumentListBuilder buildJnlpArgs(Computer c) throws Exception {
         ArgumentListBuilder args = new ArgumentListBuilder();
         args.add(new File(new File(System.getProperty("java.home")), "bin/java").getPath(), "-jar");
-        args.add(Which.jarFile(JNLPRuntime.class).getAbsolutePath());
-        args.add("-headless", "-basedir");
-        args.add(j.createTmpDir());
-        args.add("-nosecurity", "-jnlp", j.getURL() + "computer/" + c.getName() + "/jenkins-agent.jnlp");
+        args.add(Which.jarFile(Launcher.class).getAbsolutePath());
+        args.add("-jnlpUrl", j.getURL() + "computer/" + c.getName() + "/jenkins-agent.jnlp");
 
         if (c instanceof SlaveComputer) {
             SlaveComputer sc = (SlaveComputer) c;
@@ -288,14 +234,14 @@ public String call() {
     @Test
     public void testConfigRoundtrip() throws Exception {
         DumbSlave s = j.createSlave();
-        JNLPLauncher original = new JNLPLauncher("a", "b");
+        JNLPLauncher original = new JNLPLauncher("a");
         s.setLauncher(original);
         j.assertEqualDataBoundBeans(((JNLPLauncher) s.getLauncher()).getWorkDirSettings(), RemotingWorkDirSettings.getEnabledDefaults());
         RemotingWorkDirSettings custom = new RemotingWorkDirSettings(false, null, "custom", false);
         ((JNLPLauncher) s.getLauncher()).setWorkDirSettings(custom);
         HtmlPage p = j.createWebClient().getPage(s, "configure");
         j.submit(p.getFormByName("config"));
-        j.assertEqualBeans(original, s.getLauncher(), "tunnel,vmargs");
+        j.assertEqualBeans(original, s.getLauncher(), "tunnel");
         j.assertEqualDataBoundBeans(((JNLPLauncher) s.getLauncher()).getWorkDirSettings(), custom);
     }
 
diff --git a/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java b/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java
index d26883f5a28a..7d786c8bebac 100644
--- a/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java
+++ b/test/src/test/java/jenkins/agents/WebSocketAgentsTest.java
@@ -80,8 +80,7 @@ public class WebSocketAgentsTest {
      * Verify basic functionality of an agent in {@code -webSocket} mode.
      * Requires {@code remoting} to have been {@code mvn install}ed.
      * Does not show {@code FINE} or lower agent logs ({@link JenkinsRule#showAgentLogs(Slave, LoggerRule)} cannot be used here).
-     * Unlike {@link hudson.slaves.JNLPLauncherTest} this does not use {@code javaws};
-     * closer to {@link hudson.bugs.JnlpAccessWithSecuredHudsonTest}.
+     * Related to {@link hudson.slaves.JNLPLauncherTest} (also see closer to {@link hudson.bugs.JnlpAccessWithSecuredHudsonTest}).
      * @see hudson.remoting.Launcher
      */
     @SuppressWarnings("ResultOfMethodCallIgnored")
diff --git a/war/pom.xml b/war/pom.xml
index bf000697debd..33247ac395ba 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -100,26 +100,6 @@ THE SOFTWARE.
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>instance-identity</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>launchd-slave-installer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>slave-installer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>systemd-slave-installer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>upstart-slave-installer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.modules</groupId>
-      <artifactId>windows-slave-installer</artifactId>
-    </dependency>
     <dependency>
       <!--
         We bundle slf4j binding since we got some components (sshd for example)
diff --git a/war/src/main/webapp/images/webstart.gif b/war/src/main/webapp/images/webstart.gif
deleted file mode 100644
index 2a192c393ccdb8be245d3f08dba5c1c01ed05eb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1798
zcmV+h2l@C%Nk%v~VORhc0QUd@?Bv;~b~)3HIOW{S>3k9E+|B>lbK1O_)30^qoI<{P
zEX0aK;?B0xrg^?)0o%x_;fN>7oKntxB;1NF>9k(yvs|WI2E(I#>a}3x)4tE2ZQ-q2
zw3KD$v0m1JC8}Ko#)LJ-p>^AnJI1AM-G(O7x}EFc)y9}lt#T~h&bj~AZ`Gt%+^bvi
zykz9o#kOJt&z@4Tj8XOO=kn|0-_yU*p;N711lp-ty_<5mV*=Z%TJr7X|JQNh%CXIi
zJK3jJ%C3yTXAaAIBg2+X#h!5c`1aDkrOtvY*QQqM;M2o)BC}xw)}>e0y_N5{VcDoz
z(W7qg>EG6*RnwwX(4bV)i8ITKI>v!7%ea~0u3XiTJ@me1^u1*N|No;}2mji2z-9pS
zzh>xn3jcxy>xd!hf*JF?V)VRY@T5iayJ7RXVDF$n?Uga^n>p-{Df#yD(SIbuaU1yb
z@b&NL`1SGGgC@v%Bgc6o>y9bXge&~|_{)ek+l3~?dnx$!@bc>6|Ef5!Uj+ZRN&l4{
z*?u4YjuX6O0so{g(6^b(gfZT$TFI1C&Yn@nh&lh9CjYTP|GZDvcNf@m5Zc9~$c#zJ
zYY))4k<N%X|Mi2fgi*<cHr%OL<JQ5oi%9>H1?hnq!-hQaykp0(jP18z$$BHqom0Y>
zU(=pj|A-6bizxK$<?Xm(<&`(ihB45uir2uJy^2u%{QK{^WAnRX$(~x|uUy@iK-a&T
z=bAq7xnawxaJ+sp#g<*hsCdt#aHM`g`uFtg<JI4-Tkp7E^15O1xnIkhP|UK0`1J3~
zo>b4DQ>cYa>zO#@k1xNcfA8nqz=lBBr&!v+pxVWy+`ysS!=>KGp|Nu+x^*V)qD0fV
zn!uZHzn^Qzo?FwSR?MJo#ioGMr(o2(lI)&8*vhlp%(LCfwcE$3-psbqw2`KOLZpLC
zs)Iz&uzlUku)2jt%7ZZ7s#vIPDAKlxw1Y{~p;fYXFtd6y!=i1(qHVg6OY!R9(yV~Q
zlv(SPG3(#bEC2ui09XJQ000R808fD#NU)&6g9sBUT*$CtLV=jRNSsKqqQ#3CGiuz(
z(IO@=4!(pLNwTELlPFWFT*<QK$uABZ7}!Fyrp=o*F|b&Lv!~CWK!XZ3;K0yKp*AtJ
zbH@Uy)2C2x8ZcxOY6}(*VkMImwX0X3Q*#*LLbj~gvs`pc>Js4rixz0PtkS`xL#ViT
z^P<J@gb4+>ddnKfAvUmC9ZlFyD)K5zTw$ELAXsI%^4S{zx`ex1dGHG!XF`h}O*%rC
z0f{3hnngM^5*l4bU=Tg(hO$z1JFJL?0Rxk|il$7VqAcF1T(!KFs+UDs<`@yEY;e+=
zG>;db&1m1wy?c!)57^%S=+6ChYz*3+Oo`kDfUa)s`@VT|B0RY_UCOPvacoDIH<sv=
z8Ejoxk_CC)UAKe^X*B5IgANW8&n6E<5zGUdY)}Id6hO!XY$J4-1_jpaunq^O#n4_2
z5zN<#5vTo<SugmU#tv-UWQK)0JG`L`F%Uwi!V(LrVdRlW8o2=s(}=^!Jhz;~NDa?q
zAVmd8N&zC4YE&?UGe-Caz%nZu<06croB*RUSacx@5<f^WL}vM%kQpt-B$?!pfk1-B
zpMVDXrw{vdp~oDEb}@%Ejda0)7J+J!LKnOw@TV>5bddszCIrxh2|hGJ2Oam6&_xJV
zn2Lj`Ay|rr4<>Z~v49n^E|86&f<h8VAcCyn>#xB2D#9MsGysAont-s#A|L?6fB?V>
zFlj%y_$t5*bf7?wrk>6K0yJIFVGpZ&s0u_E;0Pds0K3$>N3G)o8>}FK*ziaj_~xr`
zzO57>Ll<($(S;0G6v03htms<>I$dO<z!mT);6lUax`4tT$OLdf7k*rWNEbvT^6@tB
z_~C*)+JKxy7oa4vGAPXKyYC}5d;ka=IOnW$&J!F#jW2!lK?x;2@RLU~J5RuH7fg3?
z04xH#@W&s0d?T<q0V{Ao7f|G}H55mD^9R$eVDnEGm*lbXCI0NZGaw&)aEKdp*KIc*
zb=U!i1Q{Uf!?X-~!(m4qc-Wna2X`o;xE&tUA;BG_kOBt;d<b!e5Tr;zf(H`t0RiWH
zq{4>;N{~_q1bah(x&#muZujel#O(+fwAXGsAq}X~g9dT*?z;v(sL}u-wij>w@yI8y
zeDaQbV8I||L@)jHpG49?0eUpuv>pXC5XmRghcEv4<d<)L`GZ(sK_LXR@BaJkOHxS?
z^w&>+C6d6e|Ni{<@BjbrD}?$`A%+4P@PG(RpaK`jzy><-feA!~1-#&iF<9_|7|fss
oH^{*bdhmlF)SxH4U<xmo@PsH#p$b>X!WO#lg)n5HDFOljJK5N%-2eap


From 92542e1074d88639b04547b875b4917cf92f3468 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 13:15:54 -0700
Subject: [PATCH 15/16] Bump `jenkins-test-harness` from 1751.v11e83a_ecfe14 to
 1752.v86627a_c48d91 (#6563)

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 d65a26019650..03fc7ecda4f9 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -85,7 +85,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1751.v11e83a_ecfe14</version>
+      <version>1752.v86627a_c48d91</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>

From e128402b5fa21bbb0f3b2bbf90f1469b211a0f30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 13:16:43 -0700
Subject: [PATCH 16/16] Upgrade Spring Framework from 5.3.19 to 5.3.20 (#6565)

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

diff --git a/bom/pom.xml b/bom/pom.xml
index 1f6c8cb3c555..a506415e2f15 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -56,7 +56,7 @@ THE SOFTWARE.
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
-        <version>5.3.19</version>
+        <version>5.3.20</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>