Merge pull request #311 from icatproject/setup-mysql

Update MySQL driver in setup.properties.example
icatproject · Sep 8, 2023 · 5163b81 · 5163b81
2 parents c61f756 + c586303
commit 5163b81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/config/setup.properties.example b/src/main/config/setup.properties.example
@@ -22,8 +22,7 @@ port           = 4848
 !db.logging     = FINE
 
 # MySQL
-db.driver      = com.mysql.jdbc.jdbc2.optional.MysqlDataSource
-!db.driver     = mysql-connector-java-5.1.30-bin.jar_com.mysql.jdbc.Driver_5_1
+db.driver      = com.mysql.cj.jdbc.MysqlDataSource
 db.url         = jdbc:mysql://localhost:3306/icat
 db.username    = icat
 db.password    = secret

diff --git a/src/test/scripts/prepare_test.py b/src/test/scripts/prepare_test.py
@@ -56,7 +56,7 @@
             "home           = %s" % containerHome,
             "port           = 4848",
             "# MySQL",
-            "db.driver      = com.mysql.jdbc.jdbc2.optional.MysqlDataSource",
+            "db.driver      = com.mysql.cj.jdbc.MysqlDataSource",
             "db.url         = jdbc:mysql://localhost:3306/icatdb",
             "db.username    = icatdbuser",
             "db.password    = icatdbuserpw"