From 09d66cf131500053146eb17f79e923a2997a22df Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Mon, 5 Jun 2023 02:14:18 +0100 Subject: [PATCH 1/4] Upgrade HtmlUnit from 2.x to 3.x --- pom.xml | 2 +- .../cio/hudson/plugins/rolestrategy/ApiTest.java | 8 ++++---- .../plugins/rolestrategy/ContainedInViewTest.java | 2 +- src/test/java/jmh/JmhJenkinsRule.java | 2 +- .../jenkinsci/plugins/rolestrategy/OwnershipTest.java | 10 +++++----- .../plugins/rolestrategy/Security2182Test.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 5aab2a27..7b3c7a13 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.plugins plugin - 4.65 + 4.66 diff --git a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java index d75fb3b8..891dc5a8 100644 --- a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java +++ b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java @@ -7,10 +7,10 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.Page; -import com.gargoylesoftware.htmlunit.WebRequest; -import com.gargoylesoftware.htmlunit.util.NameValuePair; +import org.htmlunit.HttpMethod; +import org.htmlunit.Page; +import org.htmlunit.WebRequest; +import org.htmlunit.util.NameValuePair; import com.synopsys.arc.jenkins.plugins.rolestrategy.RoleType; import hudson.PluginManager; import hudson.model.Item; diff --git a/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java b/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java index 68aad1ff..6ba245e3 100644 --- a/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java +++ b/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java @@ -3,7 +3,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlPage; import hudson.model.FreeStyleProject; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/jmh/JmhJenkinsRule.java b/src/test/java/jmh/JmhJenkinsRule.java index a3d77c24..de3d8df0 100644 --- a/src/test/java/jmh/JmhJenkinsRule.java +++ b/src/test/java/jmh/JmhJenkinsRule.java @@ -1,6 +1,6 @@ package jmh; -import com.gargoylesoftware.htmlunit.Cache; +import org.htmlunit.Cache; import java.net.MalformedURLException; import java.net.URL; import java.util.Objects; diff --git a/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java b/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java index 6e2bf3f0..e6054995 100644 --- a/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java +++ b/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java @@ -4,11 +4,11 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.oneOf; -import com.gargoylesoftware.htmlunit.HttpMethod; -import com.gargoylesoftware.htmlunit.WebRequest; -import com.gargoylesoftware.htmlunit.WebResponse; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.util.NameValuePair; +import org.htmlunit.HttpMethod; +import org.htmlunit.WebRequest; +import org.htmlunit.WebResponse; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.util.NameValuePair; import com.synopsys.arc.jenkins.plugins.ownership.OwnershipDescription; import com.synopsys.arc.jenkins.plugins.ownership.nodes.OwnerNodeProperty; import hudson.model.Node; diff --git a/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java b/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java index af9721ea..718514e2 100644 --- a/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java +++ b/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java @@ -5,8 +5,8 @@ import static org.hamcrest.Matchers.not; import com.cloudbees.hudson.plugins.folder.Folder; -import com.gargoylesoftware.htmlunit.Page; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.Page; +import org.htmlunit.html.HtmlPage; import com.michelin.cio.hudson.plugins.rolestrategy.RoleMap; import hudson.model.Cause; import hudson.model.FreeStyleBuild; From a2f0c47307a698f63575e716c7f782b200416253 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 6 Jun 2023 08:40:39 +0100 Subject: [PATCH 2/4] Fix checkstyle --- .../cio/hudson/plugins/rolestrategy/ApiTest.java | 8 ++++---- .../rolestrategy/GrantingDisabledPermissionTest.java | 3 --- .../plugins/rolestrategy/ContainedInViewTest.java | 2 +- src/test/java/jmh/JmhJenkinsRule.java | 2 +- .../plugins/rolestrategy/AuthorizeProjectTest.java | 2 +- .../jenkinsci/plugins/rolestrategy/OwnershipTest.java | 10 +++++----- .../plugins/rolestrategy/Security2182Test.java | 4 ++-- 7 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java index 891dc5a8..073cf41b 100644 --- a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java +++ b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/ApiTest.java @@ -7,10 +7,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import org.htmlunit.HttpMethod; -import org.htmlunit.Page; -import org.htmlunit.WebRequest; -import org.htmlunit.util.NameValuePair; import com.synopsys.arc.jenkins.plugins.rolestrategy.RoleType; import hudson.PluginManager; import hudson.model.Item; @@ -23,6 +19,10 @@ import java.util.Set; import java.util.SortedMap; import jenkins.model.Jenkins; +import org.htmlunit.HttpMethod; +import org.htmlunit.Page; +import org.htmlunit.WebRequest; +import org.htmlunit.util.NameValuePair; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/GrantingDisabledPermissionTest.java b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/GrantingDisabledPermissionTest.java index aaa6744c..280096b3 100644 --- a/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/GrantingDisabledPermissionTest.java +++ b/src/test/java/com/michelin/cio/hudson/plugins/rolestrategy/GrantingDisabledPermissionTest.java @@ -2,13 +2,10 @@ import static org.junit.Assert.assertFalse; -import hudson.model.Item; -import hudson.model.Job; import hudson.model.User; import hudson.security.ACL; import hudson.security.ACLContext; import hudson.security.HudsonPrivateSecurityRealm; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; diff --git a/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java b/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java index 6ba245e3..da08abb7 100644 --- a/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java +++ b/src/test/java/com/synopsys/arc/jenkins/plugins/rolestrategy/ContainedInViewTest.java @@ -3,8 +3,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import org.htmlunit.html.HtmlPage; import hudson.model.FreeStyleProject; +import org.htmlunit.html.HtmlPage; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/jmh/JmhJenkinsRule.java b/src/test/java/jmh/JmhJenkinsRule.java index de3d8df0..c1e1eff5 100644 --- a/src/test/java/jmh/JmhJenkinsRule.java +++ b/src/test/java/jmh/JmhJenkinsRule.java @@ -1,10 +1,10 @@ package jmh; -import org.htmlunit.Cache; import java.net.MalformedURLException; import java.net.URL; import java.util.Objects; import jenkins.model.Jenkins; +import org.htmlunit.Cache; import org.jvnet.hudson.test.JenkinsRule; /** diff --git a/src/test/java/org/jenkinsci/plugins/rolestrategy/AuthorizeProjectTest.java b/src/test/java/org/jenkinsci/plugins/rolestrategy/AuthorizeProjectTest.java index 548eec7a..0b8d3f3d 100644 --- a/src/test/java/org/jenkinsci/plugins/rolestrategy/AuthorizeProjectTest.java +++ b/src/test/java/org/jenkinsci/plugins/rolestrategy/AuthorizeProjectTest.java @@ -14,9 +14,9 @@ import hudson.model.Cause; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; +import hudson.model.Queue.Item; import hudson.model.Slave; import hudson.model.User; -import hudson.model.Queue.Item; import hudson.security.ACL; import hudson.security.ACLContext; import hudson.tasks.BuildStepDescriptor; diff --git a/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java b/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java index e6054995..8e4ca231 100644 --- a/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java +++ b/src/test/java/org/jenkinsci/plugins/rolestrategy/OwnershipTest.java @@ -4,11 +4,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.oneOf; -import org.htmlunit.HttpMethod; -import org.htmlunit.WebRequest; -import org.htmlunit.WebResponse; -import org.htmlunit.html.HtmlPage; -import org.htmlunit.util.NameValuePair; import com.synopsys.arc.jenkins.plugins.ownership.OwnershipDescription; import com.synopsys.arc.jenkins.plugins.ownership.nodes.OwnerNodeProperty; import hudson.model.Node; @@ -16,6 +11,11 @@ import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; import java.net.URL; import java.util.Collections; +import org.htmlunit.HttpMethod; +import org.htmlunit.WebRequest; +import org.htmlunit.WebResponse; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.util.NameValuePair; import org.junit.Rule; import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule.WebClient; diff --git a/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java b/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java index 718514e2..2227a0e8 100644 --- a/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java +++ b/src/test/java/org/jenkinsci/plugins/rolestrategy/Security2182Test.java @@ -5,14 +5,14 @@ import static org.hamcrest.Matchers.not; import com.cloudbees.hudson.plugins.folder.Folder; -import org.htmlunit.Page; -import org.htmlunit.html.HtmlPage; import com.michelin.cio.hudson.plugins.rolestrategy.RoleMap; import hudson.model.Cause; import hudson.model.FreeStyleBuild; import hudson.model.FreeStyleProject; import hudson.model.User; import jenkins.model.Jenkins; +import org.htmlunit.Page; +import org.htmlunit.html.HtmlPage; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; From 4fea87e70da63b4d37570c5f1f14e6b8876e7d10 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:41:23 +0100 Subject: [PATCH 3/4] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b3c7a13..c13ff65c 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ io.jenkins.tools.bom bom-2.361.x - 2102.v854b_fec19c92 + 2143.ve4c3c9ec790a pom import From bd13356a92534450d827cd13e7d6f0ada0fe3a31 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:50:30 +0100 Subject: [PATCH 4/4] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c13ff65c..7d5f2bc3 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 999999-SNAPSHOT - 2.361.4 + 2.387.3 10.12.0 @@ -58,7 +58,7 @@ io.jenkins.tools.bom - bom-2.361.x + bom-2.387.x 2143.ve4c3c9ec790a pom import