Use ojdbc6 for Oracle 11 to make timeout tests work
This commit is contained in:
parent
8ae68a66b6
commit
c0987ec548
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -16,9 +16,5 @@ dependencies {
|
|||
testImplementation project( ':hibernate-testing' )
|
||||
testImplementation libs.validator
|
||||
testRuntimeOnly jakartaLibs.el
|
||||
|
||||
if ( db.equalsIgnoreCase( 'oracle' ) ) {
|
||||
testRuntimeOnly dbLibs.oracle
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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 )
|
||||
|
|
Loading…
Reference in New Issue