diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d676b57c9..6356eb507 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,9 +4,13 @@ version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
+ labels:
+ - "dependencies"
schedule:
- interval: "weekly"
+ interval: "monthly"
- package-ecosystem: "github-actions"
directory: "/"
+ labels:
+ - "skip-changelog"
schedule:
- interval: "weekly"
+ interval: "monthly"
diff --git a/pom.xml b/pom.xml
index 0eb5b9bd8..24b20b9be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
org.jenkins-ci.plugins
plugin
- 4.73
+ 4.75
@@ -70,7 +70,7 @@
Max
Low
false
- 2.7.0
+ 2.8.2
@@ -78,7 +78,7 @@
io.jenkins.tools.bom
bom-2.414.x
- 2401.v7a_d68f8d0b_09
+ 2543.vfb_1a_5fb_9496d
pom
import
diff --git a/src/main/java/io/jenkins/docker/client/NettyDockerCmdExecFactoryCompat.java b/src/main/java/io/jenkins/docker/client/NettyDockerCmdExecFactoryCompat.java
deleted file mode 100644
index c49752be6..000000000
--- a/src/main/java/io/jenkins/docker/client/NettyDockerCmdExecFactoryCompat.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.jenkins.docker.client;
-
-import com.github.dockerjava.core.AbstractDockerCmdExecFactory;
-import com.github.dockerjava.netty.NettyDockerCmdExecFactory;
-import java.lang.reflect.Method;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Wrapper class to allow compatibility between 3.1 and 3.2 APIs
- *
- * @author bguerin
- */
-public class NettyDockerCmdExecFactoryCompat extends NettyDockerCmdExecFactory {
-
- private static final Logger LOGGER = LoggerFactory.getLogger(DockerAPI.class);
-
- public NettyDockerCmdExecFactoryCompat withConnectTimeoutCompat(Integer connectTimeout) {
- Method method = getMethod(NettyDockerCmdExecFactory.class, "withConnectTimeout");
- if (method == null) {
- method = getMethod(AbstractDockerCmdExecFactory.class, "withConnectTimeout");
- }
-
- invoke(method, connectTimeout, "withConnectTimeout");
-
- return this;
- }
-
- public NettyDockerCmdExecFactoryCompat withReadTimeoutCompat(Integer readTimeout) {
- Method method = getMethod(NettyDockerCmdExecFactory.class, "withReadTimeout");
- if (method == null) {
- method = getMethod(AbstractDockerCmdExecFactory.class, "withReadTimeout");
- }
-
- invoke(method, readTimeout, "withReadTimeout");
-
- return this;
- }
-
- private Method getMethod(Class> clazz, String name) {
- try {
- return clazz.getMethod(name, Integer.class);
- } catch (NoSuchMethodException ex) {
- return null;
- }
- }
-
- private void invoke(Method method, Integer arg, String name) {
- if (method != null) {
- try {
- method.invoke(this, arg);
- } catch (Exception ex) {
- LOGGER.error("Error invoking method {} on *DockerCmdExecFactory", name, ex);
- }
- } else {
- LOGGER.error("Could not find method {} on *DockerCmdExecFactory", name);
- }
- }
-}
diff --git a/src/main/resources/io/jenkins/docker/connector/DockerComputerJNLPConnector/help-entryPointArgumentsString.jelly b/src/main/resources/io/jenkins/docker/connector/DockerComputerJNLPConnector/help-entryPointArgumentsString.jelly
index 2fbda83a5..75de459b8 100644
--- a/src/main/resources/io/jenkins/docker/connector/DockerComputerJNLPConnector/help-entryPointArgumentsString.jelly
+++ b/src/main/resources/io/jenkins/docker/connector/DockerComputerJNLPConnector/help-entryPointArgumentsString.jelly
@@ -34,7 +34,7 @@
sh
-c
- wget $${JENKINS_URL}jnlpJars/agent.jar && java -jar agent.jar -jnlpUrl $${JENKINS_URL}computer/$${NODE_NAME}/slave-agent.jnlp -secret $${JNLP_SECRET}
+ wget $${JENKINS_URL}jnlpJars/agent.jar && java -jar agent.jar -url $${JENKINS_URL} -secret $${JNLP_SECRET} -name $${NODE_NAME}