Merge pull request #48 from timja-bot/htmlunit-2.x-to-3.x

Upgrade HtmlUnit from 2.x to 3.x
jenkinsci · Jun 5, 2023 · de9d698 · de9d698
2 parents 48a3338 + f1a2170
commit de9d698
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.56</version>
+        <version>4.66</version>
         <relativePath/>
     </parent>
 
@@ -44,6 +44,17 @@
                 <artifactId>commons-net</artifactId>
                 <version>3.9.0</version>
             </dependency>
+            <!-- TODO pending https://github.com/jenkinsci/configuration-as-code-plugin/pull/2283 in BOM -->
+            <dependency>
+                <groupId>io.jenkins</groupId>
+                <artifactId>configuration-as-code</artifactId>
+                <version>1647.ve39ca_b_829b_42</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jenkins.configuration-as-code</groupId>
+                <artifactId>test-harness</artifactId>
+                <version>1647.ve39ca_b_829b_42</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

diff --git a/src/test/java/hudson/views/BuildFilterColumnTest.java b/src/test/java/hudson/views/BuildFilterColumnTest.java
@@ -1,7 +1,7 @@
 package hudson.views;
 
-import com.gargoylesoftware.htmlunit.html.DomNode;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.DomNode;
+import org.htmlunit.html.HtmlPage;
 import hudson.Functions;
 import hudson.model.*;
 import hudson.tasks.BatchFile;

diff --git a/src/test/java/hudson/views/OtherViewsFilterTest.java b/src/test/java/hudson/views/OtherViewsFilterTest.java
@@ -1,6 +1,6 @@
 package hudson.views;
 
-import com.gargoylesoftware.htmlunit.html.*;
+import org.htmlunit.html.*;
 import hudson.model.*;
 import hudson.plugins.nested_view.NestedView;
 

diff --git a/src/test/java/hudson/views/UnclassifiedJobsFilterTest.java b/src/test/java/hudson/views/UnclassifiedJobsFilterTest.java
@@ -1,7 +1,7 @@
 package hudson.views;
 
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlDivision;
+import org.htmlunit.html.HtmlPage;
 import hudson.model.ListView;
 import hudson.model.TopLevelItem;
 import hudson.model.View;