From 903dd8e73ea59e8cab23f58fbfc51bd6195f32a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Feb 2023 19:31:59 +0000
Subject: [PATCH 1/4] Bump snakeyaml from 1.30 to 2.0 in /Common

Bumps [snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml) from 1.30 to 2.0.
- [Commits](https://bitbucket.org/snakeyaml/snakeyaml/branches/compare/snakeyaml-2.0..snakeyaml-1.30)

---
updated-dependencies:
- dependency-name: org.yaml:snakeyaml
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Common/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Common/pom.xml b/Common/pom.xml
index 6bd856f..15310d4 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -83,7 +83,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.30</version>
+            <version>2.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

From d224efce3cb43a67b23923bbdb9a1631b1c3991b Mon Sep 17 00:00:00 2001
From: Dawson Hessler <funkemunkybiz@gmail.com>
Date: Mon, 30 Oct 2023 10:12:14 -0400
Subject: [PATCH 2/4] Updating depends to make it work

---
 Assembly/dependency-reduced-pom.xml                       | 2 +-
 Bukkit/dependency-reduced-pom.xml                         | 4 ++--
 Bungee/dependency-reduced-pom.xml                         | 4 ++--
 .../brighten/antivpn/utils/config/YamlConfiguration.java  | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml
index 5924f7c..461410c 100644
--- a/Assembly/dependency-reduced-pom.xml
+++ b/Assembly/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.9.1</version>
+    <version>1.9.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Assembly</artifactId>
diff --git a/Bukkit/dependency-reduced-pom.xml b/Bukkit/dependency-reduced-pom.xml
index d81027d..5565256 100644
--- a/Bukkit/dependency-reduced-pom.xml
+++ b/Bukkit/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.9.1</version>
+    <version>1.9.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bukkit</artifactId>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.9.1</version>
+      <version>1.9.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/Bungee/dependency-reduced-pom.xml b/Bungee/dependency-reduced-pom.xml
index 98c91a2..86274ce 100644
--- a/Bungee/dependency-reduced-pom.xml
+++ b/Bungee/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AntiVPN</artifactId>
     <groupId>dev.brighten.antivpn</groupId>
-    <version>1.9.1</version>
+    <version>1.9.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>Bungee</artifactId>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>dev.brighten.antivpn</groupId>
       <artifactId>Common</artifactId>
-      <version>1.9.1</version>
+      <version>1.9.2</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>
diff --git a/Common/src/main/java/dev/brighten/antivpn/utils/config/YamlConfiguration.java b/Common/src/main/java/dev/brighten/antivpn/utils/config/YamlConfiguration.java
index d942ba0..8dcf5c9 100644
--- a/Common/src/main/java/dev/brighten/antivpn/utils/config/YamlConfiguration.java
+++ b/Common/src/main/java/dev/brighten/antivpn/utils/config/YamlConfiguration.java
@@ -23,17 +23,17 @@ public class YamlConfiguration extends ConfigurationProvider
         @Override
         protected Yaml initialValue()
         {
-            Representer representer = new Representer()
+            DumperOptions options = new DumperOptions();
+            options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
+            Representer representer = new Representer(options)
             {
                 {
                     representers.put( Configuration.class, data -> represent( ( (Configuration) data ).self ));
                 }
             };
 
-            DumperOptions options = new DumperOptions();
-            options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
             representer.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-            return new Yaml( new Constructor(), representer, options );
+            return new Yaml( new Constructor(new LoaderOptions()), representer, options );
         }
     };
 

From a79fb1fe9a120f8352d77801ecc0f6454d5dcb8a Mon Sep 17 00:00:00 2001
From: Dawson Hessler <funkemunkybiz@gmail.com>
Date: Mon, 30 Oct 2023 10:14:15 -0400
Subject: [PATCH 3/4] Updating more vulnerable depends

---
 Common/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Common/pom.xml b/Common/pom.xml
index 337c9df..d90f82c 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -74,14 +74,14 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.30</version>
+            <version>8.0.33</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.1.214</version>
+            <version>2.2.224</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

From c062e3d9103b61dee4bf8c210f72b88b01ce86d1 Mon Sep 17 00:00:00 2001
From: Dawson Hessler <funkemunkybiz@gmail.com>
Date: Mon, 30 Oct 2023 10:20:49 -0400
Subject: [PATCH 4/4] Tested and correcting dependency issues

---
 Common/pom.xml                                         | 6 +++---
 Common/src/main/java/dev/brighten/antivpn/AntiVPN.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Common/pom.xml b/Common/pom.xml
index d90f82c..620cbb7 100644
--- a/Common/pom.xml
+++ b/Common/pom.xml
@@ -72,9 +72,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.2.0</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
diff --git a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
index 99efd0d..0273e88 100644
--- a/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
+++ b/Common/src/main/java/dev/brighten/antivpn/AntiVPN.java
@@ -31,9 +31,9 @@ import java.util.List;
 
 @Getter
 @Setter(AccessLevel.PRIVATE)
-@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.1.214")
+@MavenLibrary(groupId = "com.h2database", artifactId ="h2", version = "2.2.224")
 @MavenLibrary(groupId = "org.mongodb", artifactId = "mongo-java-driver", version = "3.12.11")
-@MavenLibrary(groupId = "mysql", artifactId = "mysql-connector-java", version = "8.0.30")
+@MavenLibrary(groupId = "com.mysql", artifactId = "mysql-connector-j", version = "8.2.0")
 public class AntiVPN {
 
     private static AntiVPN INSTANCE;