From 47f66caaf3cfbec095748324f8a1b6887b8df334 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Tue, 6 Jun 2023 08:22:24 +0100 Subject: [PATCH 1/4] Upgrade HtmlUnit from 2.x to 3.x --- pom.xml | 2 +- src/test/java/hudson/tasks/MailerTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6b2094c..fd116ec 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.jenkins-ci.plugins plugin - 4.64 + 4.66 diff --git a/src/test/java/hudson/tasks/MailerTest.java b/src/test/java/hudson/tasks/MailerTest.java index dd18dd5..e8eecb3 100644 --- a/src/test/java/hudson/tasks/MailerTest.java +++ b/src/test/java/hudson/tasks/MailerTest.java @@ -23,8 +23,8 @@ */ package hudson.tasks; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlPage; import hudson.Functions; import hudson.Launcher; import hudson.model.*; @@ -264,11 +264,11 @@ public void globalConfig() throws Exception { HtmlPage cp = webClient.goTo("configure"); HtmlForm form = cp.getFormByName("config"); - form.getInputByName("_.smtpHost").setValueAttribute("acme.com"); - form.getInputByName("_.defaultSuffix").setValueAttribute("@acme.com"); + form.getInputByName("_.smtpHost").setValue("acme.com"); + form.getInputByName("_.defaultSuffix").setValue("@acme.com"); form.getInputByName("_.authentication").setChecked(true); - form.getInputByName("_.username").setValueAttribute("user"); - form.getInputByName("_.password").setValueAttribute("pass"); + form.getInputByName("_.username").setValue("user"); + form.getInputByName("_.password").setValue("pass"); rule.submit(form); From ae2e5089244d4ffa78750e96dc10ae5c0d8f58b9 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:24:46 +0100 Subject: [PATCH 2/4] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fd116ec..89afd49 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ io.jenkins.tools.bom bom-2.361.x - 2102.v854b_fec19c92 + 2143.ve4c3c9ec790a import pom From 4dd296b18773615e7592adea42697d741aae8362 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:44:27 +0100 Subject: [PATCH 3/4] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 89afd49..f72ea76 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 999999-SNAPSHOT - 2.361.4 + 2.387.4 jenkinsci/${project.artifactId}-plugin true @@ -31,7 +31,7 @@ io.jenkins.tools.bom - bom-2.361.x + bom-2.387.x 2143.ve4c3c9ec790a import pom From 2ec024882005c18b223a5242a886a738bdfbb6f9 Mon Sep 17 00:00:00 2001 From: Tim Jacomb <21194782+timja@users.noreply.github.com> Date: Tue, 6 Jun 2023 08:49:00 +0100 Subject: [PATCH 4/4] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f72ea76..a3a1fb3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 999999-SNAPSHOT - 2.387.4 + 2.387.3 jenkinsci/${project.artifactId}-plugin true