From a9b984ffc19af09c80eb0086ac72fb8db96e4769 Mon Sep 17 00:00:00 2001
From: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Date: Sun, 30 Oct 2022 11:35:45 -0700
Subject: [PATCH] Use new driver location com.mysql.cj.jdbc.Driver

---
 aspiredb/README.txt                             | 2 +-
 aspiredb/pom.xml                                | 7 +++----
 aspiredb/src/main/resources/database.properties | 3 +--
 aspiredb/src/test/resources/database.properties | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/aspiredb/README.txt b/aspiredb/README.txt
index 28d4f80d..9fcc39a0 100644
--- a/aspiredb/README.txt
+++ b/aspiredb/README.txt
@@ -36,7 +36,7 @@ whatever directory CATALINA_HOME is set to).
 
 the contents of aspiredb.properties should be as follows:
 
-jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.driverClassName=com.mysql.cj.jdbc.Driver
 
 # change this value to whatever the path is to your database with the aspiredb schema
 jdbc.url=jdbc:mysql://localhost:3306/aspiredb  
diff --git a/aspiredb/pom.xml b/aspiredb/pom.xml
index b8fe4e73..455e428a 100644
--- a/aspiredb/pom.xml
+++ b/aspiredb/pom.xml
@@ -524,7 +524,7 @@
                         </dependencies>
                         <!-- common configuration shared by all executions -->
                         <configuration>
-                            <driver>com.mysql.jdbc.Driver</driver>
+                            <driver>com.mysql.cj.jdbc.Driver</driver>
                             <username>${aspiredb.db.build.user}</username>
                             <password>${aspiredb.db.build.password}</password>
                             <onError>abort</onError>
@@ -617,13 +617,12 @@
                             <dependency>
                                 <groupId>mysql</groupId>
                                 <artifactId>mysql-connector-java</artifactId>
-                                <!-- TODO: move this into pavlab-starter-parent -->
-                                <version>8.0.27</version>
+                                <version>${mysql.version}</version>
                             </dependency>
                         </dependencies>
                         <!-- common configuration shared by all executions -->
                         <configuration>
-                            <driver>com.mysql.jdbc.Driver</driver>
+                            <driver>com.mysql.cj.jdbc.Driver</driver>
                             <username>${aspiredb.db.build.user}</username>
                             <password>${aspiredb.db.build.password}</password>
                             <onError>abort</onError>
diff --git a/aspiredb/src/main/resources/database.properties b/aspiredb/src/main/resources/database.properties
index bd41b915..1f96e93b 100644
--- a/aspiredb/src/main/resources/database.properties
+++ b/aspiredb/src/main/resources/database.properties
@@ -1,6 +1,5 @@
-jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.driverClassName=com.mysql.cj.jdbc.Driver
 jdbc.url=jdbc:mysql://localhost:3306/aspiredb?rewriteBatchedStatements=true
 jdbc.username=aspiredb_web
 jdbc.password=aspiredb
-#hibernate.dialect=org.hibernate.dialect.MySQLDialect
 hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
\ No newline at end of file
diff --git a/aspiredb/src/test/resources/database.properties b/aspiredb/src/test/resources/database.properties
index 2f967a78..23c9a0ae 100644
--- a/aspiredb/src/test/resources/database.properties
+++ b/aspiredb/src/test/resources/database.properties
@@ -1,6 +1,5 @@
-test.jdbc.driverClassName=com.mysql.jdbc.Driver
+test.jdbc.driverClassName=com.mysql.cj.jdbc.Driver
 test.jdbc.url=jdbc:mysql://localhost:3306/aspiredbtest
 test.jdbc.username=default_testdb_user
 test.jdbc.password=default_testdb_password
-#test.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 test.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
\ No newline at end of file