From b5b115fa801cebce121632ae94061798d5768b57 Mon Sep 17 00:00:00 2001 From: Marcus Hert Da Coregio Date: Thu, 20 Jun 2024 09:27:07 -0300 Subject: [PATCH] Upgrade to org.htmlunit:htmlunit:4.1.0 --- .../java-configuration/saml2/login/build.gradle | 2 +- .../java/example/LocalHostWebClient.java | 6 +++--- .../example/Saml2JavaConfigurationITests.java | 16 ++++++++-------- servlet/xml/java/saml2/login-logout/build.gradle | 2 +- .../java/example/LocalHostWebClient.java | 6 +++--- .../integTest/java/example/Saml2XmlITests.java | 16 ++++++++-------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/servlet/java-configuration/saml2/login/build.gradle b/servlet/java-configuration/saml2/login/build.gradle index 8e5865f..1256048 100644 --- a/servlet/java-configuration/saml2/login/build.gradle +++ b/servlet/java-configuration/saml2/login/build.gradle @@ -54,7 +54,7 @@ dependencies { testImplementation "org.springframework:spring-test" testImplementation "org.springframework.security:spring-security-test" testImplementation("org.junit.jupiter:junit-jupiter-api") - testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0' + testImplementation 'org.htmlunit:htmlunit:4.1.0' testImplementation 'org.hamcrest:hamcrest:2.2' testImplementation 'org.awaitility:awaitility:4.2.0' diff --git a/servlet/java-configuration/saml2/login/src/integTest/java/example/LocalHostWebClient.java b/servlet/java-configuration/saml2/login/src/integTest/java/example/LocalHostWebClient.java index 8cefa23..4970842 100644 --- a/servlet/java-configuration/saml2/login/src/integTest/java/example/LocalHostWebClient.java +++ b/servlet/java-configuration/saml2/login/src/integTest/java/example/LocalHostWebClient.java @@ -18,9 +18,9 @@ package example; import java.io.IOException; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.Page; -import com.gargoylesoftware.htmlunit.WebClient; +import org.htmlunit.FailingHttpStatusCodeException; +import org.htmlunit.Page; +import org.htmlunit.WebClient; import org.springframework.core.env.Environment; import org.springframework.util.Assert; diff --git a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java index d3f3985..301a7f2 100644 --- a/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java +++ b/servlet/java-configuration/saml2/login/src/integTest/java/example/Saml2JavaConfigurationITests.java @@ -20,14 +20,14 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import com.gargoylesoftware.htmlunit.ElementNotFoundException; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlInput; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; +import org.htmlunit.ElementNotFoundException; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlElement; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlInput; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlPasswordInput; +import org.htmlunit.html.HtmlSubmitInput; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/servlet/xml/java/saml2/login-logout/build.gradle b/servlet/xml/java/saml2/login-logout/build.gradle index eb69ecb..56475fc 100644 --- a/servlet/xml/java/saml2/login-logout/build.gradle +++ b/servlet/xml/java/saml2/login-logout/build.gradle @@ -38,7 +38,7 @@ dependencies { testImplementation "org.springframework:spring-test" testImplementation "org.springframework.security:spring-security-test" testImplementation "org.junit.jupiter:junit-jupiter-api" - testImplementation 'net.sourceforge.htmlunit:htmlunit:2.70.0' + testImplementation 'org.htmlunit:htmlunit:4.1.0' testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") diff --git a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/LocalHostWebClient.java b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/LocalHostWebClient.java index 8cefa23..4970842 100644 --- a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/LocalHostWebClient.java +++ b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/LocalHostWebClient.java @@ -18,9 +18,9 @@ package example; import java.io.IOException; -import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException; -import com.gargoylesoftware.htmlunit.Page; -import com.gargoylesoftware.htmlunit.WebClient; +import org.htmlunit.FailingHttpStatusCodeException; +import org.htmlunit.Page; +import org.htmlunit.WebClient; import org.springframework.core.env.Environment; import org.springframework.util.Assert; diff --git a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java index 4f6f1d2..bf6c07b 100644 --- a/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java +++ b/servlet/xml/java/saml2/login-logout/src/integTest/java/example/Saml2XmlITests.java @@ -19,14 +19,14 @@ package example; import java.util.ArrayList; import java.util.List; -import com.gargoylesoftware.htmlunit.ElementNotFoundException; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlElement; -import com.gargoylesoftware.htmlunit.html.HtmlForm; -import com.gargoylesoftware.htmlunit.html.HtmlInput; -import com.gargoylesoftware.htmlunit.html.HtmlPage; -import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput; -import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput; +import org.htmlunit.ElementNotFoundException; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlElement; +import org.htmlunit.html.HtmlForm; +import org.htmlunit.html.HtmlInput; +import org.htmlunit.html.HtmlPage; +import org.htmlunit.html.HtmlPasswordInput; +import org.htmlunit.html.HtmlSubmitInput; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;