From 7ba456a1131e5b6ababf7a36e26ec7e6f1420e55 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 15:29:00 +0000 Subject: [PATCH 01/13] Bump io.jenkins.tools.bom:bom-2.387.x (#1014) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a30ad17..919b0413 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ io.jenkins.tools.bom bom-2.387.x - 2401.v7a_d68f8d0b_09 + 2423.vce598171d115 pom import From ccec39ca5e6f72ff98e7d1d33367dd104603df4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 16:23:24 +0000 Subject: [PATCH 02/13] Bump junixsocket.version from 2.7.0 to 2.7.1 (#1015) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 919b0413..272dabff 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ Max Low false - 2.7.0 + 2.7.1 From 4484d13fb3d572489406629f0ba28c448f1ab920 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 17:54:22 +0000 Subject: [PATCH 03/13] Bump io.jenkins.tools.bom:bom-2.387.x (#1017) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 272dabff..eb3d7270 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ io.jenkins.tools.bom bom-2.387.x - 2423.vce598171d115 + 2446.v2e9fd3b_d8c81 pom import From d418ed66269dc4acee0bf3f268d5ee1cdb0f52c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 11:54:56 -0600 Subject: [PATCH 04/13] Bump junixsocket.version from 2.7.1 to 2.7.2 (#1018) Bumps `junixsocket.version` from 2.7.1 to 2.7.2. Updates `com.kohlschutter.junixsocket:junixsocket-common` from 2.7.1 to 2.7.2 - [Release notes](https://github.com/kohlschutter/junixsocket/releases) - [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-2.7.1...junixsocket-2.7.2) Updates `com.kohlschutter.junixsocket:junixsocket-native-common` from 2.7.1 to 2.7.2 - [Release notes](https://github.com/kohlschutter/junixsocket/releases) - [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-2.7.1...junixsocket-2.7.2) --- updated-dependencies: - dependency-name: com.kohlschutter.junixsocket:junixsocket-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.kohlschutter.junixsocket:junixsocket-native-common dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb3d7270..f2f2b46d 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ Max Low false - 2.7.1 + 2.7.2 From f5b53cd58a5b68d10083cafe40dc53fb1851b4d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 23:12:57 +0000 Subject: [PATCH 05/13] Bump io.jenkins.tools.bom:bom-2.387.x (#1020) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2f2b46d..92c506db 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ io.jenkins.tools.bom bom-2.387.x - 2446.v2e9fd3b_d8c81 + 2465.va_e76ed7b_3061 pom import From f3142c34ff485fc4fca483f88044981e99ca28b9 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 28 Sep 2023 16:13:24 -0700 Subject: [PATCH 06/13] Remove `NettyDockerCmdExecFactoryCompat` (#1021) --- .../NettyDockerCmdExecFactoryCompat.java | 59 ------------------- 1 file changed, 59 deletions(-) delete mode 100644 src/main/java/io/jenkins/docker/client/NettyDockerCmdExecFactoryCompat.java 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 c49752be..00000000 --- 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); - } - } -} From 9ea6709437157cb324a60c8ff42f6f522f0e3299 Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Sun, 1 Oct 2023 12:16:45 -0600 Subject: [PATCH 07/13] Check monthly for dependency updates Label the pull requests --- .github/dependabot.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d676b57c..6356eb50 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" From 9bdfb10e2c6b972bc58eda101d28715f9f7b8b14 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 18:27:10 +0000 Subject: [PATCH 08/13] Bump junixsocket.version from 2.7.2 to 2.8.1 (#1022) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 92c506db..5b868162 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ Max Low false - 2.7.2 + 2.8.1 From 8f2c9f43576e5d4cfd54e32b9940faf336656332 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 18:37:44 +0000 Subject: [PATCH 09/13] Bump io.jenkins.tools.bom:bom-2.387.x (#1023) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b868162..d440e490 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ io.jenkins.tools.bom bom-2.387.x - 2465.va_e76ed7b_3061 + 2483.v3b_22f030990a_ pom import From 34831ecf2827d78e75d8dca053f5e8024446c32c Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 27 Oct 2023 19:25:55 -0700 Subject: [PATCH 10/13] Avoid deprecated arguments in help text (#1025) --- .../help-entryPointArgumentsString.jelly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2fbda83a..75de459b 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}

From 50f2ab0c4f6708a2a9537d4fa6257960313fb40d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:06:26 +0000 Subject: [PATCH 11/13] Bump org.jenkins-ci.plugins:plugin from 4.73 to 4.75 (#1027) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d440e490..e79c456d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.73 + 4.75 From 4a35cdf56f64e4039aa7f32730c61efbe4967c1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:06:55 -0600 Subject: [PATCH 12/13] Bump io.jenkins.tools.bom:bom-2.387.x (#1028) Bumps [io.jenkins.tools.bom:bom-2.387.x](https://github.com/jenkinsci/bom) from 2483.v3b_22f030990a_ to 2543.vfb_1a_5fb_9496d. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.387.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e79c456d..9cbea729 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ io.jenkins.tools.bom bom-2.387.x - 2483.v3b_22f030990a_ + 2543.vfb_1a_5fb_9496d pom import From f3d9802418bc6ad7c7f6508f55493811ef0c4512 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:08:54 -0600 Subject: [PATCH 13/13] Bump junixsocket.version from 2.8.1 to 2.8.2 (#1026) Bumps `junixsocket.version` from 2.8.1 to 2.8.2. Updates `com.kohlschutter.junixsocket:junixsocket-common` from 2.8.1 to 2.8.2 - [Release notes](https://github.com/kohlschutter/junixsocket/releases) - [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-2.8.1...junixsocket-2.8.2) Updates `com.kohlschutter.junixsocket:junixsocket-native-common` from 2.8.1 to 2.8.2 - [Release notes](https://github.com/kohlschutter/junixsocket/releases) - [Commits](https://github.com/kohlschutter/junixsocket/compare/junixsocket-2.8.1...junixsocket-2.8.2) --- updated-dependencies: - dependency-name: com.kohlschutter.junixsocket:junixsocket-common dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.kohlschutter.junixsocket:junixsocket-native-common dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9cbea729..ba6948bb 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ Max Low false - 2.8.1 + 2.8.2