Update HtmlUnit to 3.x (#464)

jenkinsci · May 29, 2023 · 0537faf · 0537faf
1 parent a825200
commit 0537faf
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 44 deletions.
diff --git a/core/src/test/java/org/kohsuke/stapler/AncestorImplTest.java b/core/src/test/java/org/kohsuke/stapler/AncestorImplTest.java
@@ -1,6 +1,6 @@
 package org.kohsuke.stapler;
 
-import com.gargoylesoftware.htmlunit.WebClient;
+import org.htmlunit.WebClient;
 import org.kohsuke.stapler.test.JettyTestCase;
 
 import java.net.URL;

diff --git a/core/src/test/java/org/kohsuke/stapler/DispatcherTest.java b/core/src/test/java/org/kohsuke/stapler/DispatcherTest.java
@@ -1,11 +1,11 @@
 package org.kohsuke.stapler;
 
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.HttpMethod;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.TextPage;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebRequest;
+import org.htmlunit.FailingHttpStatusCodeException;
+import org.htmlunit.HttpMethod;
+import org.htmlunit.Page;
+import org.htmlunit.TextPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebRequest;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 import org.kohsuke.stapler.json.JsonBody;

diff --git a/core/src/test/java/org/kohsuke/stapler/Stapler2Test.java b/core/src/test/java/org/kohsuke/stapler/Stapler2Test.java
@@ -28,8 +28,8 @@
 
 import static org.junit.Assert.assertThrows;
 
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
+import org.htmlunit.FailingHttpStatusCodeException;
+import org.htmlunit.WebClient;
 import java.net.URL;
 import javax.servlet.http.HttpServletResponse;
 import org.jvnet.hudson.test.For;

diff --git a/core/src/test/java/org/kohsuke/stapler/bind/BoundObjectTableTest.java b/core/src/test/java/org/kohsuke/stapler/bind/BoundObjectTableTest.java
@@ -1,7 +1,7 @@
 package org.kohsuke.stapler.bind;
 
-import com.gargoylesoftware.htmlunit.TextPage;
-import com.gargoylesoftware.htmlunit.WebClient;
+import org.htmlunit.TextPage;
+import org.htmlunit.WebClient;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.test.JettyTestCase;

diff --git a/core/src/test/java/org/kohsuke/stapler/bind/JavaScriptProxyTest.java b/core/src/test/java/org/kohsuke/stapler/bind/JavaScriptProxyTest.java
@@ -1,9 +1,9 @@
 package org.kohsuke.stapler.bind;
 
-import com.gargoylesoftware.htmlunit.AlertHandler;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.AlertHandler;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerRequest;

diff --git a/core/src/test/java/org/kohsuke/stapler/interceptor/JsonOutputFilterTest.java b/core/src/test/java/org/kohsuke/stapler/interceptor/JsonOutputFilterTest.java
@@ -1,9 +1,9 @@
 package org.kohsuke.stapler.interceptor;
 
-import com.gargoylesoftware.htmlunit.AlertHandler;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.AlertHandler;
+import org.htmlunit.Page;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
 import org.kohsuke.stapler.StaplerResponse;

diff --git a/core/src/test/java/org/kohsuke/stapler/json/JsonBodyTest.java b/core/src/test/java/org/kohsuke/stapler/json/JsonBodyTest.java
@@ -1,9 +1,9 @@
 package org.kohsuke.stapler.json;
 
-import com.gargoylesoftware.htmlunit.HttpMethod;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.WebRequest;
-import com.gargoylesoftware.htmlunit.WebResponse;
+import org.htmlunit.HttpMethod;
+import org.htmlunit.WebClient;
+import org.htmlunit.WebRequest;
+import org.htmlunit.WebResponse;
 import java.net.URL;
 import org.kohsuke.stapler.test.JettyTestCase;
 

diff --git a/core/src/test/java/org/kohsuke/stapler/json/SubmittedFormTest.java b/core/src/test/java/org/kohsuke/stapler/json/SubmittedFormTest.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler.json;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlPage;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;

diff --git a/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java b/core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java
@@ -1,6 +1,6 @@
 package org.kohsuke.stapler.test;
 
-import com.gargoylesoftware.htmlunit.WebClient;
+import org.htmlunit.WebClient;
 import junit.framework.TestCase;
 import org.eclipse.jetty.http.UriCompliance;
 import org.eclipse.jetty.server.HttpConfiguration;

diff --git a/jelly/src/test/java/org/kohsuke/stapler/jelly/AttributeExpressionTest.java b/jelly/src/test/java/org/kohsuke/stapler/jelly/AttributeExpressionTest.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler.jelly;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlDivision;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlDivision;
+import org.htmlunit.html.HtmlPage;
 import hudson.util.VersionNumber;
 import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import java.net.URL;

diff --git a/jelly/src/test/java/org/kohsuke/stapler/jelly/BindTagTest.java b/jelly/src/test/java/org/kohsuke/stapler/jelly/BindTagTest.java
@@ -1,7 +1,7 @@
 package org.kohsuke.stapler.jelly;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import org.kohsuke.stapler.framework.adjunct.AdjunctManager;
 import org.kohsuke.stapler.test.JettyTestCase;
 

diff --git a/jelly/src/test/java/org/kohsuke/stapler/jelly/BodyExpressionTest.java b/jelly/src/test/java/org/kohsuke/stapler/jelly/BodyExpressionTest.java
@@ -1,11 +1,11 @@
 package org.kohsuke.stapler.jelly;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.DomElement;
-import com.gargoylesoftware.htmlunit.html.DomNodeList;
-import com.gargoylesoftware.htmlunit.html.HtmlDefinitionDescription;
-import com.gargoylesoftware.htmlunit.html.HtmlDefinitionTerm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.DomElement;
+import org.htmlunit.html.DomNodeList;
+import org.htmlunit.html.HtmlDefinitionDescription;
+import org.htmlunit.html.HtmlDefinitionTerm;
+import org.htmlunit.html.HtmlPage;
 import hudson.util.VersionNumber;
 import io.jenkins.lib.versionnumber.JavaSpecificationVersion;
 import java.net.URL;

diff --git a/jelly/src/test/java/org/kohsuke/stapler/jelly/TagLibNamespaceExportTest.java b/jelly/src/test/java/org/kohsuke/stapler/jelly/TagLibNamespaceExportTest.java
@@ -1,7 +1,7 @@
 package org.kohsuke.stapler.jelly;
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import org.kohsuke.stapler.test.JettyTestCase;
 
 import java.net.URL;

diff --git a/jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/Issue76Test.java b/jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/Issue76Test.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler.jelly.issue76;
 
-import com.gargoylesoftware.htmlunit.TextPage;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.TextPage;
+import org.htmlunit.WebClient;
+import org.htmlunit.html.HtmlPage;
 import org.kohsuke.stapler.test.JettyTestCase;
 
 import java.net.URL;

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
       <dependency>
         <groupId>org.jenkins-ci.main</groupId>
         <artifactId>jenkins-test-harness-htmlunit</artifactId>
-        <version>141.v740721146265</version>
+        <version>143.v8979204b_fc0c</version>
       </dependency>
       <dependency>
         <groupId>org.kohsuke.metainf-services</groupId>