From 6cdcbeb70d031d2ae5f2e6a05f698e475f106ace Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 10:26:17 +0200 Subject: [PATCH 1/5] Update MySQL JDBC driver to 8.1.0 Driver was moved to new maven coordinates --- plugin/trino-mysql-event-listener/pom.xml | 4 ++-- plugin/trino-mysql/pom.xml | 10 +++++----- plugin/trino-raptor-legacy/pom.xml | 10 +++++----- plugin/trino-resource-group-managers/pom.xml | 10 +++++----- plugin/trino-session-property-managers/pom.xml | 10 +++++----- pom.xml | 12 ++++++------ service/trino-verifier/pom.xml | 4 ++-- testing/trino-plugin-reader/pom.xml | 4 ++-- testing/trino-product-tests/pom.xml | 12 ++++++------ 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/plugin/trino-mysql-event-listener/pom.xml b/plugin/trino-mysql-event-listener/pom.xml index 12355e51c79c..d2373925fbe4 100644 --- a/plugin/trino-mysql-event-listener/pom.xml +++ b/plugin/trino-mysql-event-listener/pom.xml @@ -105,8 +105,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j runtime diff --git a/plugin/trino-mysql/pom.xml b/plugin/trino-mysql/pom.xml index bb9d084d11fa..c55eb88028ef 100644 --- a/plugin/trino-mysql/pom.xml +++ b/plugin/trino-mysql/pom.xml @@ -28,6 +28,11 @@ guice + + com.mysql + mysql-connector-j + + io.airlift configuration @@ -63,11 +68,6 @@ jakarta.validation-api - - mysql - mysql-connector-java - - org.jdbi jdbi3-core diff --git a/plugin/trino-raptor-legacy/pom.xml b/plugin/trino-raptor-legacy/pom.xml index 925055bbc6ab..cc0d76f870b4 100644 --- a/plugin/trino-raptor-legacy/pom.xml +++ b/plugin/trino-raptor-legacy/pom.xml @@ -39,6 +39,11 @@ h2 + + com.mysql + mysql-connector-j + + io.airlift bootstrap @@ -119,11 +124,6 @@ joda-time - - mysql - mysql-connector-java - - org.gaul modernizer-maven-annotations diff --git a/plugin/trino-resource-group-managers/pom.xml b/plugin/trino-resource-group-managers/pom.xml index d88d87439c2d..8f24b47c9690 100644 --- a/plugin/trino-resource-group-managers/pom.xml +++ b/plugin/trino-resource-group-managers/pom.xml @@ -151,15 +151,15 @@ - com.oracle.database.jdbc - ojdbc11 - ${dep.oracle.version} + com.mysql + mysql-connector-j runtime - mysql - mysql-connector-java + com.oracle.database.jdbc + ojdbc11 + ${dep.oracle.version} runtime diff --git a/plugin/trino-session-property-managers/pom.xml b/plugin/trino-session-property-managers/pom.xml index 746fa739e129..506595fd374e 100644 --- a/plugin/trino-session-property-managers/pom.xml +++ b/plugin/trino-session-property-managers/pom.xml @@ -38,6 +38,11 @@ guice + + com.mysql + mysql-connector-j + + io.airlift bootstrap @@ -88,11 +93,6 @@ jakarta.validation-api - - mysql - mysql-connector-java - - org.jdbi jdbi3-core diff --git a/pom.xml b/pom.xml index a9662c95012f..1ee6e1af4f0d 100644 --- a/pom.xml +++ b/pom.xml @@ -581,6 +581,12 @@ 11.2.1.jre17 + + com.mysql + mysql-connector-j + 8.1.0 + + com.nimbusds nimbus-jose-jwt @@ -1519,12 +1525,6 @@ 4.13.2 - - mysql - mysql-connector-java - 8.0.29 - - net.bytebuddy diff --git a/service/trino-verifier/pom.xml b/service/trino-verifier/pom.xml index fbc2f749d1c2..b783a88fb1c2 100644 --- a/service/trino-verifier/pom.xml +++ b/service/trino-verifier/pom.xml @@ -124,8 +124,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j runtime diff --git a/testing/trino-plugin-reader/pom.xml b/testing/trino-plugin-reader/pom.xml index 2009941d8abf..eb6cea9c1f8b 100644 --- a/testing/trino-plugin-reader/pom.xml +++ b/testing/trino-plugin-reader/pom.xml @@ -53,8 +53,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j runtime diff --git a/testing/trino-product-tests/pom.xml b/testing/trino-product-tests/pom.xml index ed5718db7491..d5274eb07bc4 100644 --- a/testing/trino-product-tests/pom.xml +++ b/testing/trino-product-tests/pom.xml @@ -247,6 +247,12 @@ runtime + + com.mysql + mysql-connector-j + runtime + + io.confluent kafka-protobuf-types @@ -284,12 +290,6 @@ runtime - - mysql - mysql-connector-java - runtime - - org.mariadb.jdbc mariadb-java-client From 1d8f2a49a9284a651ac2d448f6ac86237b8561db Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 10:30:52 +0200 Subject: [PATCH 2/5] Update MongoDB client to 4.10.2 --- plugin/trino-mongodb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-mongodb/pom.xml b/plugin/trino-mongodb/pom.xml index 9a90521e2aa1..673f86728545 100644 --- a/plugin/trino-mongodb/pom.xml +++ b/plugin/trino-mongodb/pom.xml @@ -14,7 +14,7 @@ ${project.parent.basedir} - 4.4.0 + 4.10.2 From 4641294bbf7e01a1c4a62f0136f898be0d89cc60 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 10:31:32 +0200 Subject: [PATCH 3/5] Update Redshift JDBC driver to 2.1.0.17 --- plugin/trino-redshift/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-redshift/pom.xml b/plugin/trino-redshift/pom.xml index f9975a6fe10f..b62cc3ffb013 100644 --- a/plugin/trino-redshift/pom.xml +++ b/plugin/trino-redshift/pom.xml @@ -21,7 +21,7 @@ com.amazon.redshift redshift-jdbc42 - 2.1.0.12 + 2.1.0.17 From 5b98ef26083b61020f63a75323cb93d833038897 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 10:33:44 +0200 Subject: [PATCH 4/5] Update singlestore jdbc driver to 1.1.8 --- plugin/trino-singlestore/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/trino-singlestore/pom.xml b/plugin/trino-singlestore/pom.xml index ea682200d5f6..33ce7f1a94fb 100644 --- a/plugin/trino-singlestore/pom.xml +++ b/plugin/trino-singlestore/pom.xml @@ -31,7 +31,7 @@ com.singlestore singlestore-jdbc-client - 1.0.1 + 1.1.8 From a99da56a3bb8a2e4a3cd40ca9928928c7e49c1fb Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Tue, 25 Jul 2023 10:35:28 +0200 Subject: [PATCH 5/5] Update MSSQL Server JDBC driver to 12.2.0.jre11 --- .../io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java index 1225c5c73d64..b07eb499d3b8 100644 --- a/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java +++ b/plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerConnectorTest.java @@ -605,7 +605,7 @@ public void testDateYearOfEraPredicate() assertQuery("SELECT orderdate FROM orders WHERE orderdate = DATE '1997-09-14'", "VALUES DATE '1997-09-14'"); assertQueryFails( "SELECT * FROM orders WHERE orderdate = DATE '-1996-09-14'", - "Conversion failed when converting date and/or time from character string\\."); + ".*\\QConversion failed when converting date and/or time from character string.\\E"); } @Override diff --git a/pom.xml b/pom.xml index 1ee6e1af4f0d..e56c7c687392 100644 --- a/pom.xml +++ b/pom.xml @@ -578,7 +578,7 @@ com.microsoft.sqlserver mssql-jdbc - 11.2.1.jre17 + 12.2.0.jre11