From 97a599c88538b6b893bc57816326e317bfe15c1b Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Sat, 21 Aug 2021 23:22:21 +0200
Subject: [PATCH] Implement MySQL 8 support #1779

---
 docs/config.md                                   |  9 ++++++---
 pom.xml                                          | 16 +++++++++++++---
 .../settings/properties/DatabaseSettings.java    |  5 ++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index bd4275ec..7a71dc12 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -1,5 +1,5 @@
 <!-- AUTO-GENERATED FILE! Do not edit this directly -->
-<!-- File auto-generated on Sat Aug 21 22:53:23 CEST 2021. See docs/config/config.tpl.md -->
+<!-- File auto-generated on Sat Aug 21 23:12:31 CEST 2021. See docs/config/config.tpl.md -->
 
 ## AuthMe Configuration
 The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder,
@@ -28,7 +28,10 @@ DataSource:
     mySQLUsername: authme
     # Password to connect to the MySQL database
     mySQLPassword: '12345'
-    # Driver Name of the MySQL database
+    # Driver Name of the MySQL database.
+    # Built-in drivers:
+    #     MySQL: 'com.mysql.cj.jdbc.Driver'
+    #     MariaDB: 'org.mariadb.jdbc.Driver'
     mySQLDriverClassName: com.mysql.cj.jdbc.Driver
     # Database Name, use with converters or as SQLITE database name
     mySQLDatabase: authme
@@ -587,4 +590,4 @@ To change settings on a running server, save your changes to config.yml and use
 
 ---
 
-This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Aug 21 22:53:23 CEST 2021
+This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sat Aug 21 23:12:31 CEST 2021
diff --git a/pom.xml b/pom.xml
index 5381ea49..a6d4d1ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         <maven.minimumVersion>3.6.0</maven.minimumVersion>
 
         <!-- Dependencies versions -->
-        <spigot.version>1.17-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.17.1-R0.1-SNAPSHOT</spigot.version>
 
         <!-- Versioning properties -->
         <project.outputName>AuthMe</project.outputName>
@@ -290,6 +290,7 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <!--
                         <configuration>
                             <artifactSet>
                                 <excludes>
@@ -297,7 +298,9 @@
                                 </excludes>
                             </artifactSet>
                         </configuration>
+                        -->
                     </execution>
+                    <!--
                     <execution>
                         <id>shaded-jar-legacy</id>
                         <phase>package</phase>
@@ -305,10 +308,11 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <!-- Use the base jar name, to help server owners download the right jar -->
+                            Use the base jar name, to help server owners download the right jar
                             <finalName>${project.finalNameBase}-legacy</finalName>
                         </configuration>
                     </execution>
+                    -->
                 </executions>
                 <configuration>
                     <!-- Don't create the reduced pom file, as we don't deploy the shaded jar -->
@@ -623,7 +627,13 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.49</version>
+            <version>8.0.26</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.7.4</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java b/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
index 35c69484..e7b75627 100644
--- a/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
+++ b/src/main/java/fr/xephi/authme/settings/properties/DatabaseSettings.java
@@ -45,7 +45,10 @@ public final class DatabaseSettings implements SettingsHolder {
     public static final Property<String> MYSQL_PASSWORD =
         newProperty("DataSource.mySQLPassword", "12345");
     
-        @Comment("Driver Name of the MySQL database")
+    @Comment({"Driver Name of the MySQL database.",
+        "Built-in drivers:",
+        "    MySQL: 'com.mysql.cj.jdbc.Driver'",
+        "    MariaDB: 'org.mariadb.jdbc.Driver'"})
     public static final Property<String> MYSQL_DRIVER_CLASS_NAME =
         newProperty("DataSource.mySQLDriverClassName", "com.mysql.cj.jdbc.Driver");