Skip to content

Commit 7d1b520

Browse files
timja-bottimja
andauthored
Upgrade HtmlUnit from 2.x to 3.x (#41)
Co-authored-by: Tim Jacomb <timjacomb1@gmail.com> Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
1 parent 8de1115 commit 7d1b520

File tree

5 files changed

+25
-42
lines changed

5 files changed

+25
-42
lines changed

Jenkinsfile

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1-
// Build the plugin using https://github.com/jenkins-infra/pipeline-library
2-
buildPlugin()
1+
/*
2+
See the documentation for more options:
3+
https://github.com/jenkins-infra/pipeline-library/
4+
*/
5+
buildPlugin(
6+
useContainerAgent: true, // Set to `false` if you need to use Docker for containerized tests
7+
configurations: [
8+
[platform: 'linux', jdk: 17],
9+
[platform: 'windows', jdk: 11],
10+
])

pom.xml

+4-29
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.31</version>
7+
<version>4.66</version>
88
</parent>
99
<artifactId>release</artifactId>
1010
<packaging>hpi</packaging>
@@ -16,7 +16,7 @@
1616
<url>https://github.com/jenkinsci/release-plugin</url>
1717

1818
<properties>
19-
<jenkins.version>2.308</jenkins.version>
19+
<jenkins.version>2.387.3</jenkins.version>
2020
<java.level>8</java.level>
2121
</properties>
2222

@@ -26,38 +26,13 @@
2626
<url>https://github.com/jenkinsci/release-plugin</url>
2727
<tag>HEAD</tag>
2828
</scm>
29-
<developers>
30-
<developer>
31-
<id>petehayes</id>
32-
<name>Peter Hayes</name>
33-
<email>petehayes@gmail.com</email>
34-
<timezone>-6</timezone>
35-
<roles>
36-
<role>creator (inactive)</role>
37-
</roles>
38-
</developer>
39-
<developer>
40-
<id>oleg_nenashev</id>
41-
<name>Oleg Nenashev</name>
42-
<roles>
43-
<role>maintainer (retired)</role>
44-
</roles>
45-
</developer>
46-
<developer>
47-
<id>christ66</id>
48-
<name>Steven Christou</name>
49-
<roles>
50-
<role>maintainer</role>
51-
</roles>
52-
</developer>
53-
</developers>
5429

5530
<dependencyManagement>
5631
<dependencies>
5732
<dependency>
5833
<groupId>io.jenkins.tools.bom</groupId>
59-
<artifactId>bom-2.303.x</artifactId>
60-
<version>1008.vb9e22885c9cf</version>
34+
<artifactId>bom-2.387.x</artifactId>
35+
<version>2133.v2e6c00fe4d61</version>
6136
<scope>import</scope>
6237
<type>pom</type>
6338
</dependency>

src/test/java/hudson/plugins/release/TestReleasePluginJob.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package hudson.plugins.release;
22

3-
import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
4-
import com.gargoylesoftware.htmlunit.html.HtmlForm;
5-
import com.gargoylesoftware.htmlunit.html.HtmlPage;
3+
import org.htmlunit.html.HtmlCheckBoxInput;
4+
import org.htmlunit.html.HtmlForm;
5+
import org.htmlunit.html.HtmlPage;
66

77
import org.junit.Ignore;
88
import org.jvnet.hudson.test.JenkinsRule;

src/test/java/hudson/plugins/release/TestReleasePluginParameters.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.jvnet.hudson.test.JenkinsRule;
1212
import org.jvnet.hudson.test.MockBuilder;
1313

14-
import com.gargoylesoftware.htmlunit.html.HtmlForm;
14+
import org.htmlunit.html.HtmlForm;
1515

1616
import hudson.Launcher;
1717
import hudson.model.AbstractBuild;

src/test/java/hudson/plugins/release/TestReleaseWrapper.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
*/
2424
package hudson.plugins.release;
2525

26-
import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
27-
import com.gargoylesoftware.htmlunit.HttpMethod;
28-
import com.gargoylesoftware.htmlunit.Page;
29-
import com.gargoylesoftware.htmlunit.WebRequest;
30-
import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
31-
import com.gargoylesoftware.htmlunit.html.HtmlForm;
32-
import com.gargoylesoftware.htmlunit.html.HtmlPage;
26+
import org.htmlunit.FailingHttpStatusCodeException;
27+
import org.htmlunit.HttpMethod;
28+
import org.htmlunit.Page;
29+
import org.htmlunit.WebRequest;
30+
import org.htmlunit.html.HtmlCheckBoxInput;
31+
import org.htmlunit.html.HtmlForm;
32+
import org.htmlunit.html.HtmlPage;
3333
import hudson.model.FreeStyleProject;
3434
import org.apache.http.HttpStatus;
3535
import org.junit.Assert;

0 commit comments

Comments
 (0)