Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh plugin for August 2023 #136

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.1</version>
<version>1.7</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest version at the time of this writing.

</extension>
</extensions>
5 changes: 4 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#!/usr/bin/env groovy

/* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
buildPlugin()
buildPlugin(useContainerAgent: true, configurations: [
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Container agents are now recommended in the archetype.

[platform: 'linux', jdk: 11],
[platform: 'windows', jdk: 17],
])
21 changes: 10 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.31</version>
<version>4.72</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest at the time of this writing.

</parent>

<artifactId>vsphere-cloud</artifactId>
Expand All @@ -14,7 +14,7 @@

<name>vSphere Plugin</name>
<description>Integrates Jenkins with a vSphere server</description>
<url>https://github.com/jenkinsci/vsphere-cloud-plugin</url>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following the archetype.

<licenses>
<license>
<name>Apache Software License, Version 2.0</name>
Expand Down Expand Up @@ -51,26 +51,26 @@
</developers>

<scm>
<connection>scm:git:git://github.com/jenkinsci/vsphere-cloud-plugin.git</connection>
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/vsphere-cloud-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/vsphere-cloud-plugin</url>
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</url>
Comment on lines +54 to +56
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following the archetype.

<tag>${scmTag}</tag>
</scm>

<properties>
<revision>2.28</revision>
<changelist>-SNAPSHOT</changelist>
<java.level>8</java.level>
<jenkins.version>2.263.1</jenkins.version>
<jenkins.version>2.387.3</jenkins.version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As recommended in the documentation.

<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
<spotbugs.skip>true</spotbugs.skip>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.263.x</artifactId>
<version>984.vb5eaac999a7e</version>
<artifactId>bom-2.387.x</artifactId>
<version>2329.v078520e55c19</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest version at the time of this writing.

<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down Expand Up @@ -114,7 +114,7 @@
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>node-iterator-api</artifactId>
<version>1.5</version>
<version>49.v58a_8b_35f8363</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Latest version at the time of this writing.

</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -127,7 +127,6 @@
<dependency>
<groupId>io.jenkins.plugins</groupId>
<artifactId>jaxb</artifactId>
<version>2.3.6-1</version>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now managed in the bill of materials.

</dependency>
<dependency>
<groupId>io.jenkins</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
* <tt>vmtoolsd --cmd "info-get guestinfo.Foo"</tt>.
* {@code vmtoolsd --cmd "info-get guestinfo.Foo"}.
* @param customizationSpec
* (Optional) Customization spec to use for this VM, or null
* @param jLogger
Expand Down Expand Up @@ -1092,7 +1092,7 @@ public DistributedVirtualSwitch getDistributedVirtualSwitchByPortGroup(
* <p>
* e.g. a variable named "guestinfo.Foo" with value "Bar" could be read on
* the guest using the command-line
* <tt>vmtoolsd --cmd "info-get guestinfo.Foo"</tt>.
* {@code vmtoolsd --cmd "info-get guestinfo.Foo"}.
* </p>
*
* @param vmName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
labelString: "windows vsphere"
launchDelay: 60
launcher:
jnlp:
inbound:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adapting to a Jenkins core change that renamed this to "inbound" some time back.

tunnel: "jenkins:"
limitedRunCount: 1
linkedClone: true
Expand Down