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 June 2023 #313

Merged
merged 1 commit into from
Jun 26, 2023
Merged

Refresh plugin for June 2023 #313

merged 1 commit into from
Jun 26, 2023

Conversation

basil
Copy link
Member

@basil basil commented Jun 16, 2023

Adapts to a number of breaking changes that have been piling up:

  • Require Java 11 or newer
  • Test with Java 17
  • HtmlUnit migration
  • Mockito migration

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

Comment on lines +2 to +3
[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.

@@ -30,7 +30,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.47</version>
<version>4.67</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.

@@ -46,7 +46,7 @@ THE SOFTWARE.
<revision>3.23</revision>
<changelist>-SNAPSHOT</changelist>
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
<jenkins.version>2.332.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.

<spotbugs.failOnError>false</spotbugs.failOnError>
<!-- well the parent pom could defined an empty one instead of causing failure!! -->
<argLine />
<wagonVersion>3.5.3</wagonVersion>
Copy link
Member Author

Choose a reason for hiding this comment

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

Tackling one of the Dependabot updates while I am here.

@@ -1,6 +1,6 @@
package hudson.maven;

import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.htmlunit.html.HtmlPage;
Copy link
Member Author

Choose a reason for hiding this comment

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

HtmlUnit migration

Comment on lines +27 to +28
import org.htmlunit.WebAssert;
import org.htmlunit.html.HtmlPage;
Copy link
Member Author

Choose a reason for hiding this comment

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

HtmlUnit migration

Comment on lines +5 to +8
import org.htmlunit.html.DomNodeUtil;
import org.htmlunit.html.HtmlOption;
import org.htmlunit.html.HtmlPage;
import org.htmlunit.html.HtmlSelect;
Copy link
Member Author

Choose a reason for hiding this comment

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

HtmlUnit migration

Copy link
Member Author

Choose a reason for hiding this comment

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

Upgrading Maven WAR plugin to latest version for Java 17 support.

Copy link
Member Author

Choose a reason for hiding this comment

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

Upgrading Maven WAR plugin to latest version for Java 17 support.

@basil basil marked this pull request as ready for review June 16, 2023 22:15
@basil basil requested a review from olamy June 16, 2023 22:15
Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

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

Changes look good to me.

@olamy olamy merged commit 17ebe89 into jenkinsci:master Jun 26, 2023
@basil
Copy link
Member Author

basil commented Jun 28, 2023

BOM test passed in jenkinsci/bom#2221

Would be nice to get a release of this so that we can add maven-plugin to BOM and solve jenkinsci/bom#1978

@basil
Copy link
Member Author

basil commented Jul 7, 2023

A lack of release of this PR is also blocking Java 17 PCT testing.

@basil basil deleted the refresh branch July 11, 2023 22:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants