From b109a34de9a2fc915aeb5b063717acd6db634705 Mon Sep 17 00:00:00 2001
From: soloturn <soloturn@gmail.com>
Date: Sun, 11 Jun 2023 02:30:11 +0200
Subject: [PATCH] update versions, make it work with java-20

---
 build.gradle.kts                              | 24 +++++++++++--------
 .../ripper/rippers/FuraffinityRipper.java     |  4 ++--
 .../ripme/ripper/rippers/ImgurRipper.java     |  6 ++---
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9e441b35..ecaf37c0 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,19 +17,19 @@ repositories {
 
 dependencies {
   implementation("com.lmax:disruptor:3.4.4")
-  implementation("org.java-websocket:Java-WebSocket:1.5.2")
-  implementation("org.jsoup:jsoup:1.14.3")
+  implementation("org.java-websocket:Java-WebSocket:1.5.3")
+  implementation("org.jsoup:jsoup:1.16.1")
   implementation("org.json:json:20211205")
-  implementation("com.j2html:j2html:1.5.0")
+  implementation("com.j2html:j2html:1.6.0")
   implementation("commons-configuration:commons-configuration:1.10")
   implementation("commons-cli:commons-cli:1.5.0")
-  implementation("commons-io:commons-io:2.11.0")
-  implementation("org.apache.httpcomponents:httpclient:4.5.13")
-  implementation("org.apache.httpcomponents:httpmime:4.5.13")
-  implementation("org.apache.logging.log4j:log4j-api:2.17.1")
-  implementation("org.apache.logging.log4j:log4j-core:2.17.1")
-  implementation("org.graalvm.js:js:22.0.0.2")
-  testImplementation(enforcedPlatform("org.junit:junit-bom:5.8.2"))
+  implementation("commons-io:commons-io:2.13.0")
+  implementation("org.apache.httpcomponents:httpclient:4.5.14")
+  implementation("org.apache.httpcomponents:httpmime:4.5.14")
+  implementation("org.apache.logging.log4j:log4j-api:2.20.0")
+  implementation("org.apache.logging.log4j:log4j-core:2.20.0")
+  implementation("org.graalvm.js:js:22.3.2")
+  testImplementation(enforcedPlatform("org.junit:junit-bom:5.9.3"))
   testImplementation("org.junit.jupiter:junit-jupiter")
 }
 
@@ -37,6 +37,10 @@ group = "com.rarchives.ripme"
 version = "1.7.94"
 description = "ripme"
 
+jacoco {
+  toolVersion = "0.8.10"
+}
+
 jgitver {
   gitCommitIDLength = 8
   nonQualifierBranches = "main,master"
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java
index d3357e9e..dbb46fe1 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FuraffinityRipper.java
@@ -20,7 +20,7 @@ import org.jsoup.Connection.Response;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import org.jsoup.safety.Whitelist;
+import org.jsoup.safety.Safelist;
 import org.jsoup.select.Elements;
 
 import com.rarchives.ripme.ripper.AbstractHTMLRipper;
@@ -167,7 +167,7 @@ public class FuraffinityRipper extends AbstractHTMLRipper {
             ele.select("br").append("\\n");
             ele.select("p").prepend("\\n\\n");
             LOGGER.debug("Returning description at " + page);
-            String tempPage = Jsoup.clean(ele.html().replaceAll("\\\\n", System.getProperty("line.separator")), "", Whitelist.none(), new Document.OutputSettings().prettyPrint(false));
+            String tempPage = Jsoup.clean(ele.html().replaceAll("\\\\n", System.getProperty("line.separator")), "", Safelist.none(), new Document.OutputSettings().prettyPrint(false));
             return documentz.select("meta[property=og:title]").attr("content") + "\n" + tempPage; // Overridden saveText takes first line and makes it the file name.
         } catch (IOException ioe) {
             LOGGER.info("Failed to get description " + page + " : '" + ioe.getMessage() + "'");
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
index 35fb9756..c854ae8c 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
@@ -16,7 +16,7 @@ import org.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
-import org.jsoup.safety.Whitelist;
+import org.jsoup.safety.Safelist;
 import org.jsoup.select.Elements;
 
 import com.rarchives.ripme.ripper.AlbumRipper;
@@ -256,10 +256,10 @@ public class ImgurRipper extends AlbumRipper {
         LOGGER.info("    Retrieving " + strUrl);
         Document doc = getAlbumData("https://api.imgur.com/3/album/" + strUrl.split("/a/")[1]);
         // Try to use embedded JSON to retrieve images
-        LOGGER.info(Jsoup.clean(doc.body().toString(), Whitelist.none()));
+        LOGGER.info(Jsoup.clean(doc.body().toString(), Safelist.none()));
 
             try {
-                JSONObject json = new JSONObject(Jsoup.clean(doc.body().toString(), Whitelist.none()));
+                JSONObject json = new JSONObject(Jsoup.clean(doc.body().toString(), Safelist.none()));
                 JSONArray jsonImages = json.getJSONObject("data").getJSONArray("images");
                 return createImgurAlbumFromJsonArray(url, jsonImages);
             } catch (JSONException e) {