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 #1460

Merged
merged 4 commits into from
Jun 5, 2023
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc4a713
Upgrade HtmlUnit from 2.x to 3.x
timja Jun 4, 2023
88500cf
Test configuration as code incremental
MarkEWaite Jun 5, 2023
ae5cc70
Test with configuration-as-code 1647.ve39ca_b_829b_42
MarkEWaite Jun 5, 2023
dc98744
Insert TODO comment
MarkEWaite Jun 5, 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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.65</version>
<version>4.66</version>
<relativePath />
</parent>

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/hudson/plugins/git/GitSCMTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.cloudbees.plugins.credentials.common.StandardCredentials;
import com.cloudbees.plugins.credentials.domains.Domain;
import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.htmlunit.html.HtmlPage;

import hudson.EnvVars;
import hudson.FilePath;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/hudson/plugins/git/GitTagActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.htmlunit.html.HtmlForm;
import org.htmlunit.html.HtmlPage;

import org.junit.AfterClass;
import org.junit.BeforeClass;
Expand Down Expand Up @@ -286,7 +286,7 @@ public void testDoPost() throws Exception {

HtmlPage tagPage3 = browser.getPage(p, "/3/tagBuild");
HtmlForm form3 = tagPage3.getFormByName("tag");
form3.getInputByName("name0").setValueAttribute("tag-build-3");
form3.getInputByName("name0").setValue("tag-build-3");
HtmlPage submitted3 = r.submit(form3);
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/hudson/plugins/git/browser/TFS2013GitRepositoryBrowserXSSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package hudson.plugins.git.browser;

import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.htmlunit.html.HtmlPage;
import hudson.model.FreeStyleProject;
import hudson.plugins.git.GitSCM;
import hudson.plugins.git.UserRemoteConfig;
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/hudson/plugins/git/security/ApiTokenPropertyConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package hudson.plugins.git.security;

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 hudson.plugins.git.ApiTokenPropertyConfiguration;
import jenkins.model.Jenkins;
import net.sf.json.JSONObject;
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/jenkins/plugins/git/GitSampleRepoRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

package jenkins.plugins.git;

import com.gargoylesoftware.htmlunit.WebResponse;
import com.gargoylesoftware.htmlunit.util.NameValuePair;
import org.htmlunit.WebResponse;
import org.htmlunit.util.NameValuePair;
import hudson.Launcher;
import hudson.model.TaskListener;
import hudson.plugins.git.GitSCM;
Expand Down