Merge pull request #2944 from daniel-beck/JENKINS-45679

[FIX JENKINS-45679] JNLP needs to request Java 8
jenkinsci · Jul 22, 2017 · c5f7d23 · c5f7d23
2 parents 6595ec3 + 99cf772
commit c5f7d23
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly b/core/src/main/resources/hudson/slaves/SlaveComputer/slave-agent.jnlp.jelly
@@ -50,10 +50,10 @@ THE SOFTWARE.
         <j:set var="port" value="${request.getParameter('debugPort')}"/>
         <j:choose>
           <j:when test="${port!=null}">
-            <j2se version="1.7+" java-vm-args="${it.launcher.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=${port}" />
+            <j2se version="1.8+" java-vm-args="${it.launcher.vmargs} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=${port}" />
           </j:when>
           <j:otherwise>
-            <j2se version="1.7+" java-vm-args="${it.launcher.vmargs}"/>
+            <j2se version="1.8+" java-vm-args="${it.launcher.vmargs}"/>
           </j:otherwise>
         </j:choose>
         <jar href="${rootURL}jnlpJars/remoting.jar"/>