Merge pull request #1484 from thc202/revert-updates

Revert ZAP/deps update

Author: psiinon

buildSrc/build.gradle.kts

@@ -16,7 +16,7 @@ tasks.withType<JavaCompile>().configureEach {
 
 dependencies {
     implementation("commons-configuration:commons-configuration:1.10")
-    implementation("commons-codec:commons-codec:1.20.0")
+    implementation("commons-codec:commons-codec:1.17.1")
 
     val flexmarkVersion = "0.64.8"
     implementation("com.vladsch.flexmark:flexmark-java:$flexmarkVersion")
@@ -29,7 +29,7 @@ dependencies {
     implementation("com.vladsch.flexmark:flexmark-ext-anchorlink:$flexmarkVersion")
     implementation("com.vladsch.flexmark:flexmark-profile-pegdown:$flexmarkVersion")
 
-    implementation("org.apache.commons:commons-lang3:3.19.0")
+    implementation("org.apache.commons:commons-lang3:3.12.0")
     val jgitVersion = "7.1.0.202411261347-r"
     implementation("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion")
     implementation("org.eclipse.jgit:org.eclipse.jgit.archive:$jgitVersion")
@@ -41,7 +41,7 @@ dependencies {
     }
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2")
     implementation("org.snakeyaml:snakeyaml-engine:2.6")
-    implementation("org.zaproxy:zap:2.17.0")
+    implementation("org.zaproxy:zap:2.15.0")
 }
 
 spotless {

buildSrc/src/main/java/org/zaproxy/gradle/website/Utils.java

@@ -23,7 +23,6 @@
 import java.net.URL;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.StringUtils;
 import org.zaproxy.gradle.website.TocTree.TocItem;
 
@@ -133,7 +132,10 @@ static String normaliseFileSystemPath(String path) {
     }
 
     static boolean isExternalLink(String href) {
-        return Strings.CI.startsWithAny(
-                href, HTTP_SCHEME, HTTPS_SCHEME, ABSOLUTE_SCHEME, MAILTO_SCHEME, WWW_SUBDOMAIN);
+        return StringUtils.startsWithIgnoreCase(href, HTTP_SCHEME)
+                || StringUtils.startsWithIgnoreCase(href, HTTPS_SCHEME)
+                || StringUtils.startsWithIgnoreCase(href, ABSOLUTE_SCHEME)
+                || StringUtils.startsWithIgnoreCase(href, MAILTO_SCHEME)
+                || StringUtils.startsWithIgnoreCase(href, WWW_SUBDOMAIN);
     }
 }

buildSrc/src/main/java/org/zaproxy/gradle/website/WebsitePageGenerator.java

@@ -43,7 +43,7 @@
 import java.util.Optional;
 import java.util.Set;
 import javax.help.HelpSet;
-import org.apache.commons.lang3.Strings;
+import org.apache.commons.lang3.StringUtils;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -446,6 +446,6 @@ private static void validateTocItem(TocItem tocItem, String id) {
     }
 
     private static String removeLeadingSlash(String value) {
-        return Strings.CS.removeStart(value, "/");
+        return StringUtils.removeStart(value, "/");
     }
 }