From 9e9d5b364618132e7efbbbd8ba076cf117a5e63c Mon Sep 17 00:00:00 2001 From: Gavin Date: Sat, 20 May 2023 20:40:54 +0200 Subject: [PATCH] upgrade all the jdbc drivers --- databases/cockroachdb/matrix.gradle | 2 +- databases/db2/matrix.gradle | 2 +- databases/derby/matrix.gradle | 2 +- databases/hana/matrix.gradle | 2 +- databases/mariadb/matrix.gradle | 2 +- databases/mssqlserver/matrix.gradle | 2 +- databases/mysql/matrix.gradle | 2 +- databases/pgsql/matrix.gradle | 2 +- .../asciidoc/introduction/Configuration.adoc | 2 +- settings.gradle | 24 +++++++++++-------- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/databases/cockroachdb/matrix.gradle b/databases/cockroachdb/matrix.gradle index c6ed30abc6..d33f379e7f 100644 --- a/databases/cockroachdb/matrix.gradle +++ b/databases/cockroachdb/matrix.gradle @@ -11,4 +11,4 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'org.postgresql:postgresql:42.2.8' \ No newline at end of file +jdbcDependency 'org.postgresql:postgresql:42.6.0' \ No newline at end of file diff --git a/databases/db2/matrix.gradle b/databases/db2/matrix.gradle index dfdbe2ebd0..507aca86eb 100644 --- a/databases/db2/matrix.gradle +++ b/databases/db2/matrix.gradle @@ -5,4 +5,4 @@ * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'com.ibm.db2:jcc:11.5.7.0' +jdbcDependency 'com.ibm.db2:jcc:11.5.8.0' diff --git a/databases/derby/matrix.gradle b/databases/derby/matrix.gradle index 6339f7a54e..166aa5780e 100644 --- a/databases/derby/matrix.gradle +++ b/databases/derby/matrix.gradle @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ //databaseProfile { - jdbcDependency 'org.apache.derby:derby:10.14.2.0' + jdbcDependency 'org.apache.derby:derby:10.15.2.0' // testing { // beforeSuite { diff --git a/databases/hana/matrix.gradle b/databases/hana/matrix.gradle index 59d7bc269e..cb148ae76f 100644 --- a/databases/hana/matrix.gradle +++ b/databases/hana/matrix.gradle @@ -5,4 +5,4 @@ * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'com.sap.cloud.db.jdbc:ngdbc:2.4.59' \ No newline at end of file +jdbcDependency 'com.sap.cloud.db.jdbc:ngdbc:2.16.14' \ No newline at end of file diff --git a/databases/mariadb/matrix.gradle b/databases/mariadb/matrix.gradle index 006c04d492..267035b75a 100644 --- a/databases/mariadb/matrix.gradle +++ b/databases/mariadb/matrix.gradle @@ -4,4 +4,4 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'org.mariadb.jdbc:mariadb-java-client:2.7.7' \ No newline at end of file +jdbcDependency 'org.mariadb.jdbc:mariadb-java-client:2.7.9' \ No newline at end of file diff --git a/databases/mssqlserver/matrix.gradle b/databases/mssqlserver/matrix.gradle index d5c0323a88..e4980f2559 100644 --- a/databases/mssqlserver/matrix.gradle +++ b/databases/mssqlserver/matrix.gradle @@ -5,4 +5,4 @@ * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8' \ No newline at end of file +jdbcDependency 'com.microsoft.sqlserver:mssql-jdbc:12.2.0.jre11' \ No newline at end of file diff --git a/databases/mysql/matrix.gradle b/databases/mysql/matrix.gradle index 5fb4ffd93a..5c6a709354 100644 --- a/databases/mysql/matrix.gradle +++ b/databases/mysql/matrix.gradle @@ -4,4 +4,4 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'mysql:mysql-connector-java:8.0.27' +jdbcDependency 'com.mysql:mysql-connector-j:8.0.33' diff --git a/databases/pgsql/matrix.gradle b/databases/pgsql/matrix.gradle index b8ac50d607..4389905177 100644 --- a/databases/pgsql/matrix.gradle +++ b/databases/pgsql/matrix.gradle @@ -4,4 +4,4 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'org.postgresql:postgresql:42.2.19' +jdbcDependency 'org.postgresql:postgresql:42.6.0' diff --git a/documentation/src/main/asciidoc/introduction/Configuration.adoc b/documentation/src/main/asciidoc/introduction/Configuration.adoc index 5572c58732..2982c83caa 100644 --- a/documentation/src/main/asciidoc/introduction/Configuration.adoc +++ b/documentation/src/main/asciidoc/introduction/Configuration.adoc @@ -62,7 +62,7 @@ driver for your database. | Database | Driver dependency | PostgreSQL or CockroachDB | `org.postgresql:postgresql:{version}` -| MySQL or TiDB | `mysql:mysql-connector-java:{version}` +| MySQL or TiDB | `com.mysql:mysql-connector-j:{version}` | MariaDB | `org.mariadb.jdbc:mariadb-java-client:{version}` | DB2 | `com.ibm.db2:jcc:{version}` | SQL Server | `com.microsoft.sqlserver:mssql-jdbc:${version}` diff --git a/settings.gradle b/settings.gradle index b6d9a7ae6e..c307ddedc4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -168,7 +168,7 @@ dependencyResolutionManagement { } String h2gisVersion = settings.ext.find( "gradle.libs.versions.h2gis" ) if ( h2gisVersion == null ) { - h2gisVersion = "2.1.0" + h2gisVersion = "2.2.0" } String hsqldbVersion = settings.ext.find( "gradle.libs.versions.hsqldb" ) if ( hsqldbVersion == null ) { @@ -183,25 +183,29 @@ dependencyResolutionManagement { version( "h2gis", h2gisVersion ) version( "hsqldb", hsqldbVersion ) version( "derby", derbyVersion ) - version( "pgsql", "42.5.0" ) - version( "mysql", "8.0.27" ) + version( "pgsql", "42.6.0" ) + version( "mysql", "8.0.33" ) version( "oracle", "23.2.0.0" ) + version( "mariadb", "2.7.9" ) + version( "mssql", "12.2.0.jre11" ) + version( "db2", "11.5.8.0" ) + version( "hana", "2.16.14" ) alias( "h2" ).to( "com.h2database", "h2" ).versionRef( "h2" ) alias( "h2gis" ).to( "org.orbisgis", "h2gis" ).versionRef( "h2gis" ) alias( "hsqldb" ).to( "org.hsqldb", "hsqldb" ).versionRef( "hsqldb" ) alias( "derby" ).to( "org.apache.derby", "derby" ).versionRef( "derby" ) alias( "postgresql" ).to( "org.postgresql", "postgresql" ).versionRef( "pgsql" ) - alias( "cockroachdb" ).to( "org.postgresql", "postgresql" ).version( "42.2.8" ) - alias( "mysql" ).to( "mysql", "mysql-connector-java" ).versionRef( "mysql" ) - alias( "tidb" ).to( "mysql", "mysql-connector-java" ).versionRef( "mysql" ) - alias( "mariadb" ).to( "org.mariadb.jdbc", "mariadb-java-client" ).version( "2.7.7" ) + alias( "cockroachdb" ).to( "org.postgresql", "postgresql" ).versionRef( "pgsql" ) + alias( "mysql" ).to( "com.mysql", "mysql-connector-j" ).versionRef( "mysql" ) + alias( "tidb" ).to( "com.mysql", "mysql-connector-j" ).versionRef( "mysql" ) + alias( "mariadb" ).to( "org.mariadb.jdbc", "mariadb-java-client" ).versionRef( "mariadb" ) alias( "oracle" ).to( "com.oracle.database.jdbc", "ojdbc11" ).versionRef( "oracle" ) alias( "oracleXml" ).to( "com.oracle.database.xml", "xdb" ).versionRef( "oracle" ) alias( "oracleXmlParser" ).to( "com.oracle.database.xml", "xmlparserv2" ).versionRef( "oracle" ) - alias( "mssql" ).to( "com.microsoft.sqlserver", "mssql-jdbc" ).version( "11.2.0.jre11" ) - alias( "db2" ).to( "com.ibm.db2", "jcc" ).version( "11.5.7.0" ) - alias( "hana" ).to( "com.sap.cloud.db.jdbc", "ngdbc" ).version( "2.4.59" ) + alias( "mssql" ).to( "com.microsoft.sqlserver", "mssql-jdbc" ).versionRef( "mssql" ) + alias( "db2" ).to( "com.ibm.db2", "jcc" ).versionRef( "db2" ) + alias( "hana" ).to( "com.sap.cloud.db.jdbc", "ngdbc" ).versionRef( "hana" ) alias( "sybase" ).to( "net.sourceforge.jtds", "jtds" ).version( "1.3.1" ) alias( "informix" ).to( "com.ibm.informix", "jdbc" ).version( "4.10.12" ) alias( "firebird" ).to( "org.firebirdsql.jdbc", "jaybird" ).version( "4.0.8.java11" )