Upgrade HtmlUnit from 2.x to 3.x (#278)

Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>
jenkinsci · Jun 6, 2023 · dafeae8 · dafeae8
1 parent e29970c
commit dafeae8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.62</version>
+        <version>4.66</version>
         <relativePath />
     </parent>
 

diff --git a/...redentials/secretsmanager/config/client/credentialsProvider/WebCredentialsProviderIT.java b/...redentials/secretsmanager/config/client/credentialsProvider/WebCredentialsProviderIT.java
@@ -1,6 +1,6 @@
 package io.jenkins.plugins.credentials.secretsmanager.config.client.credentialsProvider;
 
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlForm;
 import io.jenkins.plugins.credentials.secretsmanager.config.PluginConfiguration;
 import io.jenkins.plugins.credentials.secretsmanager.util.JenkinsConfiguredWithWebRule;
 import io.jenkins.plugins.credentials.secretsmanager.util.PluginConfigurationForm;
@@ -27,25 +27,25 @@ protected void setDefaultCredentialsProvider() {
     protected void setSTSAssumeRoleCredentialsProvider(String roleArn, String roleSessionName) {
         r.configure(form -> {
             setClientCredentialsProviderSelect(form,"STS AssumeRole");
-            form.getInputByName("_.roleArn").setValueAttribute(roleArn);
-            form.getInputByName("_.roleSessionName").setValueAttribute(roleSessionName);
+            form.getInputByName("_.roleArn").setValue(roleArn);
+            form.getInputByName("_.roleSessionName").setValue(roleSessionName);
         });
     }
 
     @Override
     protected void setProfileCredentialsProvider(String profileName) {
         r.configure(form -> {
             setClientCredentialsProviderSelect(form, "Profile");
-            form.getInputByName("_.profileName").setValueAttribute(profileName);
+            form.getInputByName("_.profileName").setValue(profileName);
         });
     }
 
     @Override
     protected void setStaticCredentialsProvider(String accessKey, String secretKey) {
         r.configure(form -> {
             setClientCredentialsProviderSelect(form, "Static");
-            form.getInputByName("_.accessKey").setValueAttribute(accessKey);
-            form.getInputByName("_.secretKey").setValueAttribute(secretKey);
+            form.getInputByName("_.accessKey").setValue(accessKey);
+            form.getInputByName("_.secretKey").setValue(secretKey);
         });
     }
 

diff --git a/...ntials/secretsmanager/config/client/endpointConfiguration/WebEndpointConfigurationIT.java b/...ntials/secretsmanager/config/client/endpointConfiguration/WebEndpointConfigurationIT.java
@@ -18,7 +18,7 @@ protected PluginConfiguration getPluginConfiguration() {
     protected void setEndpointConfiguration(String serviceEndpoint, String signingRegion) {
         r.configure(form -> {
             form.getInputByName("_.endpointConfiguration").setChecked(true);
-            form.getInputByName("_.serviceEndpoint").setValueAttribute(serviceEndpoint);
+            form.getInputByName("_.serviceEndpoint").setValue(serviceEndpoint);
             form.getSelectByName("_.signingRegion").setSelectedAttribute(signingRegion, true);
         });
     }

diff --git a/src/test/java/io/jenkins/plugins/credentials/secretsmanager/config/filters/WebFiltersIT.java b/src/test/java/io/jenkins/plugins/credentials/secretsmanager/config/filters/WebFiltersIT.java
@@ -38,7 +38,7 @@ protected void setFilters(Filter... filters) {
             form.getSelectByName("_.key").setSelectedAttribute(filter.getKey(), true);
             // TODO support multiple filter values
             // this is a hack that skips the 'other' _.value input in the form
-            form.getInputsByName("_.value").get(0).setValueAttribute(filter.getValues().get(0).getValue());
+            form.getInputsByName("_.value").get(0).setValue(filter.getValues().get(0).getValue());
         });
     }
 }
diff --git a/.../io/jenkins/plugins/credentials/secretsmanager/config/transformations/name/WebNameIT.java b/.../io/jenkins/plugins/credentials/secretsmanager/config/transformations/name/WebNameIT.java
@@ -25,7 +25,7 @@ protected void setRemovePrefix(String prefix) {
 
             final var select = f.getDropdownList("Name");
             select.getOptionByText("Remove Prefix").setSelected(true);
-            form.getInputByName("_.prefix").setValueAttribute(prefix);
+            form.getInputByName("_.prefix").setValue(prefix);
         });
     }
 
@@ -39,7 +39,7 @@ protected void setRemovePrefixes(Set<Prefix> prefixes) {
 
             // TODO support multiple prefix values
             final var firstPrefix = prefixes.stream().findFirst().get().getValue();
-            form.getInputsByName("_.value").get(0).setValueAttribute(firstPrefix);
+            form.getInputsByName("_.value").get(0).setValue(firstPrefix);
         });
     }
 }
diff --git a/...java/io/jenkins/plugins/credentials/secretsmanager/util/JenkinsConfiguredWithWebRule.java b/...java/io/jenkins/plugins/credentials/secretsmanager/util/JenkinsConfiguredWithWebRule.java
@@ -1,8 +1,8 @@
 package io.jenkins.plugins.credentials.secretsmanager.util;
 
-import com.gargoylesoftware.htmlunit.NicelyResynchronizingAjaxController;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.NicelyResynchronizingAjaxController;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlPage;
 
 import org.jvnet.hudson.test.JenkinsRule;
 

diff --git a/...test/java/io/jenkins/plugins/credentials/secretsmanager/util/PluginConfigurationForm.java b/...test/java/io/jenkins/plugins/credentials/secretsmanager/util/PluginConfigurationForm.java
@@ -1,8 +1,8 @@
 package io.jenkins.plugins.credentials.secretsmanager.util;
 
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlSelect;
+import org.htmlunit.html.HtmlButton;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlSelect;
 
 import java.util.List;