From e65ceca2f8a6bf09b5028d2e1967405fdb038e23 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Mon, 11 Sep 2017 03:57:32 +0200
Subject: [PATCH] Rename 'minimumJavaVersion' to 'requiredJava'

---
 core/src/main/java/hudson/model/UpdateSite.java          | 8 ++++----
 core/src/main/resources/hudson/PluginManager/table.jelly | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java
index b3ff312768..34a8c04b2d 100644
--- a/core/src/main/java/hudson/model/UpdateSite.java
+++ b/core/src/main/java/hudson/model/UpdateSite.java
@@ -954,7 +954,7 @@ public class UpdateSite {
          * @since TODO
          */
         @Exported
-        public final String minimumJavaVersion;
+        public final String requiredJava;
         /**
          * Categories for grouping plugins, taken from labels assigned to wiki page.
          * Can be null.
@@ -981,7 +981,7 @@ public class UpdateSite {
             this.title = get(o,"title");
             this.excerpt = get(o,"excerpt");
             this.compatibleSinceVersion = get(o,"compatibleSinceVersion");
-            this.minimumJavaVersion = get(o,"minimumJavaVersion");
+            this.requiredJava = get(o,"requiredJava");
 
             this.requiredCore = get(o,"requiredCore");
             this.categories = o.has("labels") ? (String[])o.getJSONArray("labels").toArray(new String[0]) : null;
@@ -1113,7 +1113,7 @@ public class UpdateSite {
          */
         public boolean isForNewerJava() {
             try {
-                return minimumJavaVersion != null && new VersionNumber(minimumJavaVersion).isNewerThan(
+                return requiredJava != null && new VersionNumber(requiredJava).isNewerThan(
                         new VersionNumber(System.getProperty("java.version")));
             } catch (NumberFormatException nfe) {
                 return false; // plugin doesn't declare a minimum Java version
@@ -1141,7 +1141,7 @@ public class UpdateSite {
         public VersionNumber getNeededDependenciesRequiredJava() {
             VersionNumber versionNumber = null;
             try {
-                versionNumber = minimumJavaVersion == null ? null : new VersionNumber(minimumJavaVersion);
+                versionNumber = requiredJava == null ? null : new VersionNumber(requiredJava);
             } catch (NumberFormatException nfe) {
                 // unable to parse version
             }
diff --git a/core/src/main/resources/hudson/PluginManager/table.jelly b/core/src/main/resources/hudson/PluginManager/table.jelly
index 1480b90742..4667cee418 100644
--- a/core/src/main/resources/hudson/PluginManager/table.jelly
+++ b/core/src/main/resources/hudson/PluginManager/table.jelly
@@ -107,7 +107,7 @@ THE SOFTWARE.
                         <div class="compatWarning">${%coreWarning(p.requiredCore)}</div>
                       </j:if>
                       <j:if test="${p.isForNewerJava()}">
-                        <div class="compatWarning">${%javaWarning(p.minimumJavaVersion)}</div>
+                        <div class="compatWarning">${%javaWarning(p.requiredJava)}</div>
                       </j:if>
                       <j:if test="${!p.isNeededDependenciesCompatibleWithInstalledVersion(cache)}">
                         <div class="compatWarning">${%depCompatWarning}</div>