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.

Sign up for GitHub

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

Upgrade HtmlUnit from 2.x to 3.x #296

Closed
wants to merge 5 commits into from
Closed

Upgrade HtmlUnit from 2.x to 3.x #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbdc8ec
Upgrade HtmlUnit from 2.x to 3.x
timja Jun 5, 2023
d8ed923
Update Jenkinsfile
timja Jun 6, 2023
6f44b03
Update pom.xml
timja Jun 6, 2023
6b4000f
Update Jenkinsfile
timja Jun 17, 2023
e9eb33a
Update pom.xml
timja Jun 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
buildPlugin(platforms: [
'linux',
'maven-windows' // TODO Docker-based tests fail when using Docker on Windows. The maven-windows agents do not have Docker installed so tests that require Docker are skipped.
/*
See the documentation for more options:
https://github.com/jenkins-infra/pipeline-library/
*/
buildPlugin(
useContainerAgent: false, // Set to `false` if you need to use Docker for containerized tests
configurations: [
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
Comment on lines +5 to +9
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
buildPlugin(
useContainerAgent: false, // Set to `false` if you need to use Docker for containerized tests
configurations: [
[platform: 'linux', jdk: 17],
[platform: 'windows', jdk: 11],
buildPlugin(useContainerAgent: false, configurations: [
[platform: 'linux', jdk: 17],
[platform: 'maven-11-windows', jdk: 11] // TODO Docker-based tests fail when using Docker on Windows. The maven-windows agents do not have Docker installed so tests that require Docker are skipped.

])
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.51</version>
<version>4.67</version>
<relativePath />
</parent>
<artifactId>docker-workflow</artifactId>
Expand All @@ -30,7 +30,7 @@

<properties>
<changelist>999999-SNAPSHOT</changelist>
<jenkins.version>2.332.1</jenkins.version>
<jenkins.version>2.387.3</jenkins.version>
Copy link
Member

Choose a reason for hiding this comment

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

Why is this baseline bump necessary?

<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
</properties>
<repositories>
Expand All @@ -49,8 +49,8 @@
<dependencies>
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.332.x</artifactId>
<version>1643.v1cffef51df73</version>
<artifactId>bom-2.387.x</artifactId>
<version>2143.ve4c3c9ec790a</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions .../java/org/jenkinsci/plugins/docker/workflow/declarative/DockerDirectiveGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

package org.jenkinsci.plugins.docker.workflow.declarative;

import com.gargoylesoftware.htmlunit.HttpMethod;
import com.gargoylesoftware.htmlunit.WebRequest;
import com.gargoylesoftware.htmlunit.WebResponse;
import com.gargoylesoftware.htmlunit.util.NameValuePair;
import org.htmlunit.HttpMethod;
import org.htmlunit.WebRequest;
import org.htmlunit.WebResponse;
import org.htmlunit.util.NameValuePair;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.model.Describable;
import java.net.URL;
Expand Down