From bbc0934b1f37c6206d75a4b852e4355dc068d88b Mon Sep 17 00:00:00 2001
From: NovaFox161 <novamaday@gmail.com>
Date: Sat, 19 Aug 2023 09:31:15 -0500
Subject: [PATCH] Update several dependencies

---
 build.gradle.kts                              |  8 +++---
 .../discal/core/utils/GlobalVal.kt            |  6 ++---
 gradle.properties                             | 26 +++++++++----------
 web/build.gradle.kts                          | 10 +++----
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5d2029a34..21d3e1a25 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,6 +35,7 @@ allprojects {
     //Plugins
     apply(plugin = "java")
     apply(plugin = "kotlin")
+    apply(plugin = "io.spring.dependency-management")
 
     //Compiler nonsense
     java.sourceCompatibility = JavaVersion.VERSION_17
@@ -66,15 +67,13 @@ allprojects {
     // Various libs
     val okhttpVersion: String by properties
     val copyDownVersion: String by properties
+    val jsoupVersion: String by properties
 
     repositories {
         mavenCentral()
         mavenLocal()
 
-        maven {
-            url = uri("https://repo.maven.apache.org/maven2/")
-        }
-
+        maven("https://repo.maven.apache.org/maven2/")
         maven("https://kotlin.bintray.com/kotlinx")
         maven("https://oss.sonatype.org/content/repositories/snapshots")
         maven("https://repo.spring.io/milestone")
@@ -122,6 +121,7 @@ allprojects {
         // Various Libs
         implementation("com.squareup.okhttp3:okhttp:$okhttpVersion")
         implementation("io.github.furstenheim:copy_down:$copyDownVersion")
+        implementation("org.jsoup:jsoup:$jsoupVersion")
     }
 
     kotlin {
diff --git a/core/src/main/kotlin/org/dreamexposure/discal/core/utils/GlobalVal.kt b/core/src/main/kotlin/org/dreamexposure/discal/core/utils/GlobalVal.kt
index b08b8bf3d..77074e657 100644
--- a/core/src/main/kotlin/org/dreamexposure/discal/core/utils/GlobalVal.kt
+++ b/core/src/main/kotlin/org/dreamexposure/discal/core/utils/GlobalVal.kt
@@ -8,7 +8,7 @@ import io.github.furstenheim.OptionsBuilder
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
-import org.jsoup.safety.Whitelist
+import org.jsoup.safety.Safelist
 import org.slf4j.Marker
 import org.slf4j.MarkerFactory
 
@@ -45,9 +45,9 @@ object GlobalVal {
         ignoreUnknownKeys = true
     }
 
-    val HTML_WHITELIST: Whitelist
+    val HTML_WHITELIST: Safelist
         get() {
-            return Whitelist.basic()
+            return Safelist.basic()
                     .preserveRelativeLinks(false)
                     .removeAttributes("sub", "sup", "small")
         }
diff --git a/gradle.properties b/gradle.properties
index a0ed9ee3a..478831921 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,39 +12,39 @@ gitPropertiesVersion=2.4.1
 kotlinPoetVersion=1.14.2
 
 # Tools
-kotlinxCoroutinesReactorVersion=1.6.4
-reactorKotlinExtensions=1.1.7
+kotlinxCoroutinesReactorVersion=1.7.3
+reactorKotlinExtensions=1.2.2
 
 # Discord
 discord4jVersion=3.2.5
 discord4jStoresVersion=3.2.2
-discordWebhookVersion=0.8.2
+discordWebhookVersion=0.8.4
 
 # Spring
 springVersion=3.1.2
 
 # Thymeleaf
-thymeleafVersion=3.1.0.M2
-thymeleafLayoutDialectVersion=3.1.0
+thymeleafVersion=3.1.2.RELEASE
 
 # Database
 flywayVersion=9.3.0
 mikuR2dbcMySqlVersion=0.8.2.RELEASE
-mySqlConnectorJava=8.0.30
+mySqlConnectorJava=8.0.33
 
 # Serialization
-kotlinxSerializationJsonVersion=1.4.0
-jacksonVersion=2.13.4
-jsonVersion=20220320
+kotlinxSerializationJsonVersion=1.5.1
+jacksonVersion=2.15.2
+jsonVersion=20230618
 
 # Google libs
-googleApiClientVersion=2.0.0
-googleServicesCalendarVersion=v3-rev20220715-2.0.0
+googleApiClientVersion=2.2.0
+googleServicesCalendarVersion=v3-rev411-1.25.0
 googleOauthClientVersion=1.34.1
 
 # Various Libs
-okhttpVersion=4.10.0
-copyDownVersion=1.0
+okhttpVersion=4.11.0
+copyDownVersion=1.1
+jsoupVersion=1.16.1
 
 # Jib properties
 baseImage=eclipse-temurin:17-jdk-alpine
diff --git a/web/build.gradle.kts b/web/build.gradle.kts
index 21a9fe084..e8720c665 100644
--- a/web/build.gradle.kts
+++ b/web/build.gradle.kts
@@ -8,28 +8,26 @@ plugins {
     // Spring
     kotlin("plugin.spring")
     id("org.springframework.boot")
-    id("io.spring.dependency-management")
+    //id("io.spring.dependency-management")
 
     // Tooling
     id("com.google.cloud.tools.jib")
 }
 
 // Versions -- found in gradle.properties
-val springVersion: String by properties
 // Thymeleaf
 val thymeleafVersion: String by properties
-val thymeleafLayoutDialectVersion: String by properties
 
 dependencies {
     api(project(":core"))
 
     // Spring
-    implementation("org.springframework.boot:spring-boot-starter-thymeleaf:$springVersion")
+    implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
 
     //Thymeleaf
-    implementation("org.thymeleaf:thymeleaf:$thymeleafVersion")
+    implementation("org.thymeleaf:thymeleaf")
     implementation("org.thymeleaf:thymeleaf-spring5:$thymeleafVersion")
-    implementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:$thymeleafLayoutDialectVersion")
+    implementation("nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect")
 }
 
 kotlin {