From 03f5487d3dfaf58521a66c5f68ee086d10f38483 Mon Sep 17 00:00:00 2001 From: Gavin Date: Sat, 20 May 2023 20:31:13 +0200 Subject: [PATCH] use Oracle driver odbc11 since we now depend on Java 11 --- databases/oracle/matrix.gradle | 2 +- .../src/main/asciidoc/introduction/Configuration.adoc | 2 +- settings.gradle | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/databases/oracle/matrix.gradle b/databases/oracle/matrix.gradle index cf9b710808..7920475bbc 100644 --- a/databases/oracle/matrix.gradle +++ b/databases/oracle/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 'com.oracle.database.jdbc:ojdbc8:21.8.0.0' \ No newline at end of file +jdbcDependency 'com.oracle.database.jdbc:ojdbc11:23.2.0.0' \ No newline at end of file diff --git a/documentation/src/main/asciidoc/introduction/Configuration.adoc b/documentation/src/main/asciidoc/introduction/Configuration.adoc index e7395dfc76..5572c58732 100644 --- a/documentation/src/main/asciidoc/introduction/Configuration.adoc +++ b/documentation/src/main/asciidoc/introduction/Configuration.adoc @@ -66,7 +66,7 @@ driver for your database. | MariaDB | `org.mariadb.jdbc:mariadb-java-client:{version}` | DB2 | `com.ibm.db2:jcc:{version}` | SQL Server | `com.microsoft.sqlserver:mssql-jdbc:${version}` -| Oracle | `com.oracle.database.jdbc:ojdbc8:${version}` +| Oracle | `com.oracle.database.jdbc:ojdbc11:${version}` | H2 | `com.h2database:h2:{version}` | HSQLDB | `org.hsqldb:hsqldb:{version}` |=== diff --git a/settings.gradle b/settings.gradle index 702415e24b..b6d9a7ae6e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -185,7 +185,7 @@ dependencyResolutionManagement { version( "derby", derbyVersion ) version( "pgsql", "42.5.0" ) version( "mysql", "8.0.27" ) - version( "oracle", "21.8.0.0" ) + version( "oracle", "23.2.0.0" ) alias( "h2" ).to( "com.h2database", "h2" ).versionRef( "h2" ) alias( "h2gis" ).to( "org.orbisgis", "h2gis" ).versionRef( "h2gis" ) @@ -196,7 +196,7 @@ dependencyResolutionManagement { 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( "oracle" ).to( "com.oracle.database.jdbc", "ojdbc8" ).versionRef( "oracle" ) + 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" )