diff --git a/pom.xml b/pom.xml index efead2df..2d710f6a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.jenkins-ci.plugins plugin - 4.64 + 4.66 diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java b/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java index 67255bb0..ad25a30b 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/ConfigFilesSEC1253Test.java @@ -1,10 +1,10 @@ package org.jenkinsci.plugins.configfiles; -import com.gargoylesoftware.htmlunit.html.HtmlAnchor; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlInput; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlRadioButtonInput; +import org.htmlunit.html.HtmlAnchor; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlInput; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlRadioButtonInput; import hudson.util.VersionNumber; import org.jenkinsci.plugins.configfiles.custom.CustomConfig; import org.junit.Rule; @@ -42,10 +42,10 @@ public void regularCaseStillWorking() throws Exception { HtmlPage createGroovyConfig = j.submit(addConfigForm); HtmlInput configIdInput = createGroovyConfig.getElementByName("config.id"); - configIdInput.setValueAttribute(CONFIG_ID); + configIdInput.setValue(CONFIG_ID); HtmlInput configNameInput = createGroovyConfig.getElementByName("config.name"); - configNameInput.setValueAttribute("Regular name"); + configNameInput.setValue("Regular name"); HtmlForm saveConfigForm = createGroovyConfig.getForms().stream() .filter(htmlForm -> htmlForm.getActionAttribute().equals("saveConfig")) diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java index d4eef81e..eb885f5b 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/buildwrapper/ConfigFileBuildWrapperTest.java @@ -1,9 +1,9 @@ package org.jenkinsci.plugins.configfiles.buildwrapper; -import com.gargoylesoftware.htmlunit.html.DomElement; -import com.gargoylesoftware.htmlunit.html.DomNodeList; -import com.gargoylesoftware.htmlunit.html.HtmlOption; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.html.DomElement; +import org.htmlunit.html.DomNodeList; +import org.htmlunit.html.HtmlOption; +import org.htmlunit.html.HtmlPage; import hudson.Launcher; import hudson.maven.MavenModuleSet; import hudson.model.*; diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java index 420a8a5b..663d2c1a 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/folder/FolderConfigFileActionTest.java @@ -1,8 +1,8 @@ package org.jenkinsci.plugins.configfiles.folder; import com.cloudbees.hudson.plugins.folder.Folder; -import com.gargoylesoftware.htmlunit.html.HtmlAnchor; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlAnchor; +import org.htmlunit.html.HtmlPage; import hudson.model.Item; import hudson.util.VersionNumber; import jenkins.model.Jenkins; diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java index 996134bd..2a9a6ed9 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/maven/job/MvnSettingsProviderTest.java @@ -1,7 +1,7 @@ package org.jenkinsci.plugins.configfiles.maven.job; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlTextInput; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlTextInput; import hudson.maven.MavenModuleSet; import hudson.model.Cause; import hudson.model.FreeStyleProject; @@ -107,8 +107,8 @@ public void configMustBeVisibleFromConfigPage() throws Exception { final HtmlTextInput name = page.getElementByName("config.name"); final HtmlTextInput comment = page.getElementByName("config.comment"); - Assert.assertEquals("name NOK", c1.name, name.getValueAttribute()); - Assert.assertEquals("comment NOK", c1.comment, comment.getValueAttribute()); + Assert.assertEquals("name NOK", c1.name, name.getValue()); + Assert.assertEquals("comment NOK", c1.comment, comment.getValue()); } { // GlobalMavenSettingsConfig @@ -118,8 +118,8 @@ public void configMustBeVisibleFromConfigPage() throws Exception { final HtmlTextInput name = page.getElementByName("config.name"); final HtmlTextInput comment = page.getElementByName("config.comment"); - Assert.assertEquals("name NOK", c2.name, name.getValueAttribute()); - Assert.assertEquals("comment NOK", c2.comment, comment.getValueAttribute()); + Assert.assertEquals("name NOK", c2.name, name.getValue()); + Assert.assertEquals("comment NOK", c2.comment, comment.getValue()); } } diff --git a/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java b/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java index 12b5be29..99bb536f 100644 --- a/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java +++ b/src/test/java/org/jenkinsci/plugins/configfiles/sec/Security2002Test.java @@ -1,7 +1,7 @@ package org.jenkinsci.plugins.configfiles.sec; -import com.gargoylesoftware.htmlunit.html.HtmlAnchor; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlAnchor; +import org.htmlunit.html.HtmlPage; import hudson.util.VersionNumber; import jenkins.model.GlobalConfiguration; import org.jenkinsci.plugins.configfiles.GlobalConfigFiles;