From 05037a087ffc751e064710c207ad6b26c51d4a38 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Wed, 13 Dec 2023 11:10:02 -0800 Subject: [PATCH] Print deprecation warning when using `-jnlpUrl` (#8773) --- core/src/main/java/hudson/slaves/SlaveComputer.java | 6 ++++++ pom.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 1633536633b0..bc9922180f39 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -877,6 +877,12 @@ public HttpResponse doSlaveAgentJnlp(StaplerRequest req, StaplerResponse res) { @WebMethod(name = "jenkins-agent.jnlp") public HttpResponse doJenkinsAgentJnlp(StaplerRequest req, StaplerResponse res) { + LOGGER.log( + Level.WARNING, + "Agent \"" + getName() + + "\" is connecting with the \"-jnlpUrl\" argument, which is deprecated." + + " Use \"-url\" and \"-name\" instead, potentially also passing in" + + " \"-webSocket\", \"-tunnel\", and/or work directory options as needed."); return new EncryptedSlaveAgentJnlpFile(this, "jenkins-agent.jnlp.jelly", getName(), CONNECT); } diff --git a/pom.xml b/pom.xml index 01ccb41a6627..03014fa4fb2e 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ THE SOFTWARE. https://www.jenkins.io/changelog - 3192.v713e3b_039fb_e + 3198.v03a_401881f3e 4.13