[FIXED JENKINS-24251] Do not issue bogus warning about missing default JDK.

core/src/main/java/hudson/model/AbstractProject.java

@@ -350,7 +350,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
                 jdkTool = jdkTool.forNode(node, listener);
             }
             jdkTool.buildEnvVars(env);
-        } else if (jdk != null) {
+        } else if (jdk != null && !jdk.equals(JDK.DEFAULT_NAME)) {
             listener.getLogger().println("No JDK named ‘" + jdk + "’ found");
         }
 

core/src/main/java/hudson/model/JDK.java

@@ -52,6 +52,13 @@ import org.kohsuke.stapler.DataBoundConstructor;
  * @author Kohsuke Kawaguchi
  */
 public final class JDK extends ToolInstallation implements NodeSpecific<JDK>, EnvironmentSpecific<JDK> {
+
+    /**
+     * Name of the “default JDK”, meaning no specific JDK selected.
+     * @since 1.577
+     */
+    public static final String DEFAULT_NAME = "(Default)";
+
     /**
      * @deprecated since 2009-02-25
      */

core/src/main/java/jenkins/model/Jenkins.java

@@ -3598,7 +3598,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * If the user chose the default JDK, make sure we got 'java' in PATH.
      */
     public FormValidation doDefaultJDKCheck(StaplerRequest request, @QueryParameter String value) {
-        if(!value.equals("(Default)"))
+        if(!value.equals(JDK.DEFAULT_NAME))
             // assume the user configured named ones properly in system config ---
             // or else system config should have reported form field validation errors.
             return FormValidation.ok();

core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly

@@ -37,7 +37,8 @@ THE SOFTWARE.
     <f:entry title="JDK"
              description="${%JDK to be used for this project}">
       <select class="setting-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
-        <option>${%default.value}</option>
+        <j:getStatic var="DEFAULT_NAME" className="hudson.model.JDK" field="DEFAULT_NAME"/>
+        <option>${DEFAULT_NAME}</option>
         <j:forEach var="inst" items="${jdks}">
           <f:option selected="${inst.name==it.JDK.name}" value="${inst.name}">${inst.name}</f:option>
         </j:forEach>

core/src/main/resources/hudson/model/AbstractProject/configure-common.properties

@@ -20,6 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-default.value=(Default)
 Advanced\ Project\ Options=Advanced Project Options
 Display\ Name=Display Name

core/src/main/resources/hudson/model/AbstractProject/configure-common_pt_BR.properties

@@ -21,8 +21,6 @@
 # THE SOFTWARE.
 
 Advanced\ Project\ Options=Op\u00e7\u00f5es avan\u00e7adas do projeto
-# (Default)
-default.value=Default
 Node=N\u00f3
 Tie\ this\ project\ to\ a\ node=Vincular esse projeto a um n\u00f3
 Display\ Name=Nome de exibi\u00e7\u00e3o