Merge 6701422c50 into 9095a1bffd

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) {
+	implementation libs.org.htmlunit.htmlunit
-		exclude group: 'org.eclipse.jetty.websocket', module: 'websocket-client'
-	}
 	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

buildSrc/src/main/java/s101/S101PluginExtension.java

@@ -20,9 +20,9 @@ import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.gargoylesoftware.htmlunit.WebClient;
+import org.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlAnchor;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPage;
 import org.gradle.api.Project;
 import org.gradle.api.provider.Property;
 import org.gradle.api.tasks.Input;

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

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'