From c0987ec5480d38fdd13fc419000d7afb5f82cffc Mon Sep 17 00:00:00 2001 From: Christian Beikov Date: Mon, 2 Oct 2023 15:19:12 +0200 Subject: [PATCH] Use ojdbc6 for Oracle 11 to make timeout tests work --- ci/build.sh | 4 +--- gradle/java-module.gradle | 15 ++++++++++++--- hibernate-c3p0/hibernate-c3p0.gradle | 4 ---- settings.gradle | 4 ++++ 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ci/build.sh b/ci/build.sh index e2b0c074e7..8a1e97d27c 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -17,11 +17,9 @@ elif [ "$RDBMS" == "postgresql" ] || [ "$RDBMS" == "postgresql_11" ]; then elif [ "$RDBMS" == "edb" ] || [ "$RDBMS" == "edb_11" ]; then goal="-Pdb=edb_ci -DdbHost=localhost:5444" elif [ "$RDBMS" == "oracle" ]; then - # I have no idea why, but these tests don't seem to work on CI... goal="-Pdb=oracle_ci" elif [ "$RDBMS" == "oracle_11_2" ]; then - # I have no idea why, but these tests don't seem to work on CI... - goal="-Pdb=oracle_legacy_ci -PexcludeTests=**.LockTest.testQueryTimeout*" + goal="-Pdb=oracle_legacy_ci elif [ "$RDBMS" == "db2" ]; then goal="-Pdb=db2_ci" elif [ "$RDBMS" == "db2_10_5" ]; then diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle index ee7d348385..6ef0534677 100644 --- a/gradle/java-module.gradle +++ b/gradle/java-module.gradle @@ -100,9 +100,6 @@ dependencies { testRuntimeOnly dbLibs.mssql testRuntimeOnly dbLibs.informix testRuntimeOnly dbLibs.cockroachdb - testRuntimeOnly dbLibs.oracle - testRuntimeOnly dbLibs.oracleXml - testRuntimeOnly dbLibs.oracleXmlParser testRuntimeOnly dbLibs.sybase testRuntimeOnly rootProject.fileTree(dir: 'drivers', include: '*.jar') @@ -124,6 +121,18 @@ dependencies { else if ( db.startsWith( 'firebird' ) ) { testRuntimeOnly dbLibs.firebird } + else if ( db.startsWith( 'oracle' ) ) { + if ( db.startsWith( 'oracle_legacy' ) ) { + testRuntimeOnly dbLibs.oracleLegacy + testRuntimeOnly dbLibs.oracleLegacyXml + testRuntimeOnly dbLibs.oracleLegacyXmlParser + } + else { + testRuntimeOnly dbLibs.oracle + testRuntimeOnly dbLibs.oracleXml + testRuntimeOnly dbLibs.oracleXmlParser + } + } annotationProcessor libs.loggingProcessor annotationProcessor libs.logging diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle index 9e68c8a25b..b5bce3e188 100644 --- a/hibernate-c3p0/hibernate-c3p0.gradle +++ b/hibernate-c3p0/hibernate-c3p0.gradle @@ -16,9 +16,5 @@ dependencies { testImplementation project( ':hibernate-testing' ) testImplementation libs.validator testRuntimeOnly jakartaLibs.el - - if ( db.equalsIgnoreCase( 'oracle' ) ) { - testRuntimeOnly dbLibs.oracle - } } diff --git a/settings.gradle b/settings.gradle index 17ba4128f6..b36767829f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -219,6 +219,7 @@ dependencyResolutionManagement { def mssqlVersion = version "mssql", "12.2.0.jre11" def mysqlVersion = version "mysql", "8.0.33" def oracleVersion = version "oracle", "23.2.0.0" + def oracleLegacyVersion = version "oracleLegacy", "11.2.0.4" def pgsqlVersion = version "pgsql", "42.6.0" def sybaseVersion = version "sybase", "1.3.1" def tidbVersion = version "tidb", mysqlVersion @@ -235,6 +236,9 @@ dependencyResolutionManagement { library( "oracle", "com.oracle.database.jdbc", "ojdbc11" ).versionRef( oracleVersion ) library( "oracleXml", "com.oracle.database.xml", "xdb" ).versionRef( oracleVersion ) library( "oracleXmlParser", "com.oracle.database.xml", "xmlparserv2" ).versionRef( oracleVersion ) + library( "oracleLegacy", "com.oracle.database.jdbc", "ojdbc6" ).versionRef( oracleLegacyVersion ) + library( "oracleLegacyXml", "com.oracle.database.xml", "xdb6" ).versionRef( oracleLegacyVersion ) + library( "oracleLegacyXmlParser", "com.oracle.database.xml", "xmlparserv2" ).versionRef( oracleLegacyVersion ) library( "mssql", "com.microsoft.sqlserver", "mssql-jdbc" ).versionRef( mssqlVersion ) library( "db2", "com.ibm.db2", "jcc" ).versionRef( db2Version ) library( "hana", "com.sap.cloud.db.jdbc", "ngdbc" ).versionRef( hanaVersion )