From 6084cb54001937d59baca0cf7a761addb9da6e76 Mon Sep 17 00:00:00 2001 From: Zac Spitzer Date: Tue, 5 Nov 2024 13:42:57 +0100 Subject: [PATCH] LDEV-5136 update mysql to 9.1.0 https://luceeserver.atlassian.net/browse/LDEV-5136 --- core/src/main/java/META-INF/MANIFEST.MF | 2 +- core/src/main/java/lucee/runtime/db/DBUtil.java | 2 +- test/_setupTestServices.cfc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/META-INF/MANIFEST.MF b/core/src/main/java/META-INF/MANIFEST.MF index 4e473756dd..19a6f2ee16 100644 --- a/core/src/main/java/META-INF/MANIFEST.MF +++ b/core/src/main/java/META-INF/MANIFEST.MF @@ -361,7 +361,7 @@ Require-Bundle: org.apache.commons.commons-codec;bundle-version=1.15.0, com.github.f4b6a3.ulid;bundle-version=5.2.3, org.lucee.janino;bundle-version=3.1.9, org.lucee.janinocc;bundle-version=3.1.9 -Require-Extension: 7E673D15-D87C-41A6-8B5F1956528C605F;name=MySQL;label=MySQL;version=9.0.0, +Require-Extension: 7E673D15-D87C-41A6-8B5F1956528C605F;name=MySQL;label=MySQL;version=9.1.0, 99A4EF8D-F2FD-40C8-8FB8C2E67A4EEEB6;name=MSSQL;label=MS SQL Server;version=12.6.3.jre11, 671B01B8-B3B3-42B9-AC055A356BED5281;name=PostgreSQL;label=PostgreSQL;version=42.7.3, 2BCD080F-4E1E-48F5-BEFE794232A21AF6;name=JDTsSQL;label=jTDS (MSSQL);version=1.3.1, diff --git a/core/src/main/java/lucee/runtime/db/DBUtil.java b/core/src/main/java/lucee/runtime/db/DBUtil.java index d8b19695fe..63300c976a 100644 --- a/core/src/main/java/lucee/runtime/db/DBUtil.java +++ b/core/src/main/java/lucee/runtime/db/DBUtil.java @@ -69,7 +69,7 @@ public static DataSourceDefintion getDataSourceDefintionForType(Config config, S } if ("mysql".equals(type)) { if (MYSQL == null) { - JDBCDriver jdbc = getJDBCDriver(config, "mysql", "com.mysql.cj.jdbc.Driver", "com.mysql.cj", "8.0.15", "jdbc:mysql://{host}:{port}/{database}"); + JDBCDriver jdbc = getJDBCDriver(config, "mysql", "com.mysql.cj.jdbc.Driver", "com.mysql.cj", "9.1.0", "jdbc:mysql://{host}:{port}/{database}"); MYSQL = new DataSourceDefintion(jdbc.cd, jdbc.connStr, 3306); } return MYSQL; diff --git a/test/_setupTestServices.cfc b/test/_setupTestServices.cfc index 8c7a4e5679..4b5f901f93 100644 --- a/test/_setupTestServices.cfc +++ b/test/_setupTestServices.cfc @@ -564,7 +564,7 @@ component { return { class: 'com.mysql.cj.jdbc.Driver' , bundleName: 'com.mysql.cj' - , bundleVersion: server.getDefaultBundleVersion( 'com.mysql.cj', '8.3.0' ) + , bundleVersion: server.getDefaultBundleVersion( 'com.mysql.cj', '9.1.0' ) , connectionString: 'jdbc:mysql://#mySQL.server#:#mySQL.port#/#mySQL.database#?useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=true&useSSL=false' & arguments.connectionString , username: mySQL.username , password: mySQL.password