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

Modernize plugin #943

Merged
merged 5 commits into from
May 21, 2023
Merged

Modernize plugin #943

merged 5 commits into from
May 21, 2023

Conversation

basil
Copy link
Member

@basil basil commented May 20, 2023

To test this PR I did a build on a Docker agent.

Comment on lines +11 to +12
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
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: Linux JDK 17, Windows JDK 11.

@@ -2,6 +2,6 @@
<extension>
<groupId>io.jenkins.tools.incrementals</groupId>
<artifactId>git-changelist-maven-extension</artifactId>
<version>1.0-beta-5</version>
<version>1.6</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.

@@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.51</version>
<version>4.63</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. Requires 2.361.1 or later and Java 11.

@@ -15,7 +15,7 @@

<name>Docker plugin</name>
<description>Provide Cloud Provisioning and other Docker features</description>
<url>https://github.com/jenkinsci/docker-plugin</url>
<url>https://github.com/jenkinsci/${project.artifactId}</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.

@@ -55,8 +55,7 @@
<properties>
<revision>1.3.1</revision>
<changelist>-SNAPSHOT</changelist>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Copy link
Member Author

Choose a reason for hiding this comment

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

No longer needed in the latest parent POM.

<groupId>com.github.docker-java</groupId>
<artifactId>docker-java-transport-httpclient5</artifactId>
<version>3.2.13</version>
<version>3.2.13-68.va_875df25a_b_45</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.

</dependency>

<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>docker-commons</artifactId>
<version>1.18</version>
<version>419.v8e3cd84ef49c</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.

Comment on lines -153 to -159
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>

Copy link
Member Author

Choose a reason for hiding this comment

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

Unnecessary dependency.

pom.xml Outdated
Comment on lines 173 to 174
<artifactId>bom-2.361.x</artifactId>
<version>2081.v85885a_d2e5c5</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.

Comment on lines +182 to +184
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
<developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
<url>https://github.com/${gitHubRepo}</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.

@basil
Copy link
Member Author

basil commented May 20, 2023

Used my admin powers to replay the build with the Jenkinsfile changes here: https://ci.jenkins.io/job/Plugins/job/docker-plugin/job/PR-943/11/

Comment on lines -198 to -201
String vmargs = jnlpLauncher.vmargs;
if (StringUtils.isNotBlank(vmargs)) {
DockerEnvUtils.addEnvToCmd("JAVA_OPT", vmargs.trim(), cmd);
}
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 of jenkinsci/jenkins#6543 vmargs is no longer supported, so this is dead code (along with the corresponding tests).

@basil basil added the internal label May 21, 2023
@basil basil merged commit 10581e1 into jenkinsci:master May 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant