From aa7c12794d39f92465675c7add43c5d7f86eb499 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 17 Aug 2023 15:32:44 -0700 Subject: [PATCH] Refresh plugin for August 2023 --- .mvn/extensions.xml | 2 +- Jenkinsfile | 5 ++++- pom.xml | 21 +++++++++---------- .../plugins/vsphere/tools/VSphere.java | 4 ++-- .../plugins/vsphere/tools/expected_output.yml | 2 +- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 5f510417..1f363640 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.1 + 1.7 diff --git a/Jenkinsfile b/Jenkinsfile index 77c9ed70..56e15577 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,7 @@ #!/usr/bin/env groovy /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */ -buildPlugin() +buildPlugin(useContainerAgent: true, configurations: [ + [platform: 'linux', jdk: 11], + [platform: 'windows', jdk: 17], +]) diff --git a/pom.xml b/pom.xml index 4c5ae946..ec5d6821 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.31 + 4.72 vsphere-cloud @@ -14,7 +14,7 @@ vSphere Plugin Integrates Jenkins with a vSphere server - https://github.com/jenkinsci/vsphere-cloud-plugin + https://github.com/jenkinsci/${project.artifactId}-plugin Apache Software License, Version 2.0 @@ -51,17 +51,17 @@ - scm:git:git://github.com/jenkinsci/vsphere-cloud-plugin.git - scm:git:ssh://git@github.com/jenkinsci/vsphere-cloud-plugin.git - https://github.com/jenkinsci/vsphere-cloud-plugin + scm:git:https://github.com/${gitHubRepo}.git + scm:git:git@github.com:${gitHubRepo}.git + https://github.com/${gitHubRepo} ${scmTag} 2.28 -SNAPSHOT - 8 - 2.263.1 + 2.387.3 + jenkinsci/${project.artifactId}-plugin true @@ -69,8 +69,8 @@ io.jenkins.tools.bom - bom-2.263.x - 984.vb5eaac999a7e + bom-2.387.x + 2329.v078520e55c19 import pom @@ -114,7 +114,7 @@ org.jenkins-ci.plugins node-iterator-api - 1.5 + 49.v58a_8b_35f8363 org.jenkins-ci.plugins @@ -127,7 +127,6 @@ io.jenkins.plugins jaxb - 2.3.6-1 io.jenkins diff --git a/src/main/java/org/jenkinsci/plugins/vsphere/tools/VSphere.java b/src/main/java/org/jenkinsci/plugins/vsphere/tools/VSphere.java index 422bf991..8481e1ed 100644 --- a/src/main/java/org/jenkinsci/plugins/vsphere/tools/VSphere.java +++ b/src/main/java/org/jenkinsci/plugins/vsphere/tools/VSphere.java @@ -211,7 +211,7 @@ public void cloneVm(String cloneName, String sourceName, boolean linkedClone, St * parameter can be read by the VMware Tools on the client OS. * e.g. a variable named "guestinfo.Foo" with value "Bar" could * be read on the guest using the command-line - * vmtoolsd --cmd "info-get guestinfo.Foo". + * {@code vmtoolsd --cmd "info-get guestinfo.Foo"}. * @param customizationSpec * (Optional) Customization spec to use for this VM, or null * @param jLogger @@ -1092,7 +1092,7 @@ public DistributedVirtualSwitch getDistributedVirtualSwitchByPortGroup( *

* e.g. a variable named "guestinfo.Foo" with value "Bar" could be read on * the guest using the command-line - * vmtoolsd --cmd "info-get guestinfo.Foo". + * {@code vmtoolsd --cmd "info-get guestinfo.Foo"}. *

* * @param vmName diff --git a/src/test/resources/org/jenkinsci/plugins/vsphere/tools/expected_output.yml b/src/test/resources/org/jenkinsci/plugins/vsphere/tools/expected_output.yml index ea40ad9e..0753d3e7 100644 --- a/src/test/resources/org/jenkinsci/plugins/vsphere/tools/expected_output.yml +++ b/src/test/resources/org/jenkinsci/plugins/vsphere/tools/expected_output.yml @@ -13,7 +13,7 @@ labelString: "windows vsphere" launchDelay: 60 launcher: - jnlp: + inbound: tunnel: "jenkins:" limitedRunCount: 1 linkedClone: true