diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 87b5fcd62f5..3d479b7ff00 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -79,9 +79,7 @@ dependencies { implementation libs.io.spring.javaformat.spring.javaformat.gradle.plugin implementation libs.io.spring.nohttp.nohttp.gradle implementation libs.org.jetbrains.kotlin.kotlin.gradle.plugin - implementation (libs.net.sourceforge.htmlunit) { - exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client' - } + implementation libs.org.htmlunit.htmlunit implementation libs.org.hidetake.gradle.ssh.plugin implementation libs.org.jfrog.buildinfo.build.info.extractor.gradle implementation libs.org.sonarsource.scanner.gradle.sonarqube.gradle.plugin diff --git a/buildSrc/src/main/java/s101/S101PluginExtension.java b/buildSrc/src/main/java/s101/S101PluginExtension.java index 8fedb6569fd..33f68845a59 100644 --- a/buildSrc/src/main/java/s101/S101PluginExtension.java +++ b/buildSrc/src/main/java/s101/S101PluginExtension.java @@ -20,9 +20,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.gargoylesoftware.htmlunit.WebClient; -import com.gargoylesoftware.htmlunit.html.HtmlAnchor; -import com.gargoylesoftware.htmlunit.html.HtmlPage; +import org.htmlunit.WebClient; +import org.htmlunit.html.HtmlAnchor; +import org.htmlunit.html.HtmlPage; import org.gradle.api.Project; import org.gradle.api.provider.Property; import org.gradle.api.tasks.Input; diff --git a/dependencies/spring-security-dependencies.gradle b/dependencies/spring-security-dependencies.gradle index 513ec88747f..05ad0ed460c 100644 --- a/dependencies/spring-security-dependencies.gradle +++ b/dependencies/spring-security-dependencies.gradle @@ -48,7 +48,6 @@ dependencies { api libs.jakarta.websocket.jakarta.websocket.api api libs.jakarta.websocket.jakarta.websocket.client.api api libs.ldapsdk - api libs.net.sourceforge.htmlunit api libs.org.htmlunit.htmlunit api libs.org.apache.httpcomponents.httpclient api libs.org.aspectj.aspectjrt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d234aa85db2..2db3e64e374 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -47,7 +47,6 @@ jakarta-websocket-jakarta-websocket-api = { module = "jakarta.websocket:jakarta. jakarta-websocket-jakarta-websocket-client-api = { module = "jakarta.websocket:jakarta.websocket-client-api", version.ref = "jakarta-websocket" } jakarta-xml-bind-jakarta-xml-bind-api = "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4" ldapsdk = "ldapsdk:ldapsdk:4.1" -net-sourceforge-htmlunit = "net.sourceforge.htmlunit:htmlunit:2.70.0" org-htmlunit-htmlunit = "org.htmlunit:htmlunit:4.11.1" org-apache-httpcomponents-httpclient = "org.apache.httpcomponents.client5:httpclient5:5.5.1" org-apache-kerby-simplekdc='org.apache.kerby:kerb-simplekdc:2.1.1'