From 5a69e49fb9225eccaa6808f3139329209a8f1a99 Mon Sep 17 00:00:00 2001
From: Dawson Hessler <funkemunkybiz@gmail.com>
Date: Fri, 1 Apr 2022 11:50:32 -0400
Subject: [PATCH] Relocating shaded depends to prevent incompatibilities

---
 Assembly/dependency-reduced-pom.xml           | 29 +++++++++++++++++--
 Assembly/pom.xml                              | 28 +++++++++++++++++-
 .../utils/config/YamlConfiguration.java       |  3 --
 Common/src/main/resources/config.yml          |  4 +--
 4 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/Assembly/dependency-reduced-pom.xml b/Assembly/dependency-reduced-pom.xml
index df32d86..4f5e177 100644
--- a/Assembly/dependency-reduced-pom.xml
+++ b/Assembly/dependency-reduced-pom.xml
@@ -11,7 +11,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.2.4</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -20,6 +20,32 @@
             </goals>
             <configuration>
               <minimizeJar>false</minimizeJar>
+              <relocations>
+                <relocation>
+                  <pattern>org.yaml.snakeyaml</pattern>
+                  <shadedPattern>dev.brighten.antivpn.utils.shaded.org.yaml.snakeyaml</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.mongodb</pattern>
+                  <shadedPattern>dev.brighten.antivpn.utils.shaded.com.mongodb</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>org.bson</pattern>
+                  <shadedPattern>dev.brighten.antivpn.utils.shaded.org.bson</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.mysql</pattern>
+                  <shadedPattern>dev.brighten.antivpn.utils.shaded.com.mysql</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.google</pattern>
+                  <shadedPattern>dev.brighten.antivpn.utils.shaded.com.google</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>com.moandjiezana</pattern>
+                  <shadedPattern>dev.brighten.antivpn.utils.shaded.com.moandjiezana</shadedPattern>
+                </relocation>
+              </relocations>
             </configuration>
           </execution>
         </executions>
@@ -39,4 +65,3 @@
     <maven.compiler.source>8</maven.compiler.source>
   </properties>
 </project>
-
diff --git a/Assembly/pom.xml b/Assembly/pom.xml
index 3894153..ee603e7 100644
--- a/Assembly/pom.xml
+++ b/Assembly/pom.xml
@@ -21,7 +21,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -30,6 +30,32 @@
                         </goals>
                         <configuration>
                             <minimizeJar>false</minimizeJar>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.yaml.snakeyaml</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.utils.shaded.org.yaml.snakeyaml</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.mongodb</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.utils.shaded.com.mongodb</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.bson</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.utils.shaded.org.bson</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.mysql</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.utils.shaded.com.mysql</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.utils.shaded.com.google</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.moandjiezana</pattern>
+                                    <shadedPattern>dev.brighten.antivpn.utils.shaded.com.moandjiezana</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
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 b61f0a6..d942ba0 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
@@ -7,9 +7,6 @@ import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
-import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.representer.Represent;
 import org.yaml.snakeyaml.representer.Representer;
 
 import java.io.*;
diff --git a/Common/src/main/resources/config.yml b/Common/src/main/resources/config.yml
index 76c8abe..ab4945a 100644
--- a/Common/src/main/resources/config.yml
+++ b/Common/src/main/resources/config.yml
@@ -17,8 +17,8 @@ database:
   # Enable to cache queries and save alerts state beyond restarts
   enabled: false
   useCredentials: true
-  #Options Mongo and MySQL
-  type: MySQL
+  #Options Mongo, MySQL, or H2
+  type: H2
   # The database name you would like to use
   database: kaurivpn
   # Can be used if you prefer to authenticate via Mongo URL