Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use ojdbc6 for Oracle 11 to make timeout tests work

This commit is contained in:
Christian Beikov 2023-10-02 15:19:12 +02:00
parent 34a1e89ad7
commit 0bc9557830
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/build.sh
View File

@ -19,11 +19,9 @@ elif [ "$RDBMS" == "postgresql" ] || [ "$RDBMS" == "postgresql_10" ]; then
elif [ "$RDBMS" == "edb" ] || [ "$RDBMS" == "edb_10" ]; then elif [ "$RDBMS" == "edb" ] || [ "$RDBMS" == "edb_10" ]; then
goal="-Pdb=edb_ci -DdbHost=localhost:5444" goal="-Pdb=edb_ci -DdbHost=localhost:5444"
elif [ "$RDBMS" == "oracle" ]; then elif [ "$RDBMS" == "oracle" ]; then
# I have no idea why, but these tests don't seem to work on CI...
goal="-Pdb=oracle_ci" goal="-Pdb=oracle_ci"
elif [ "$RDBMS" == "oracle_11_2" ]; then 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
goal="-Pdb=oracle_legacy_ci -PexcludeTests=**.LockTest.testQueryTimeout*"
elif [ "$RDBMS" == "db2" ]; then elif [ "$RDBMS" == "db2" ]; then
goal="-Pdb=db2_ci" goal="-Pdb=db2_ci"
elif [ "$RDBMS" == "db2_10_5" ]; then elif [ "$RDBMS" == "db2_10_5" ]; then

15
gradle/java-module.gradle
View File

@ -100,9 +100,6 @@ dependencies {
testRuntimeOnly dbLibs.mssql testRuntimeOnly dbLibs.mssql
testRuntimeOnly dbLibs.informix testRuntimeOnly dbLibs.informix
testRuntimeOnly dbLibs.cockroachdb testRuntimeOnly dbLibs.cockroachdb
testRuntimeOnly dbLibs.oracle
testRuntimeOnly dbLibs.oracleXml
testRuntimeOnly dbLibs.oracleXmlParser
testRuntimeOnly dbLibs.sybase testRuntimeOnly dbLibs.sybase
testRuntimeOnly rootProject.fileTree(dir: 'drivers', include: '*.jar') testRuntimeOnly rootProject.fileTree(dir: 'drivers', include: '*.jar')
@ -124,6 +121,18 @@ dependencies {
else if ( db.startsWith( 'firebird' ) ) { else if ( db.startsWith( 'firebird' ) ) {
testRuntimeOnly dbLibs.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.loggingProcessor
annotationProcessor libs.logging annotationProcessor libs.logging

4
hibernate-c3p0/hibernate-c3p0.gradle
View File

@ -16,9 +16,5 @@ dependencies {
testImplementation project( ':hibernate-testing' ) testImplementation project( ':hibernate-testing' )
testImplementation libs.validator testImplementation libs.validator
testRuntimeOnly jakartaLibs.el testRuntimeOnly jakartaLibs.el
if ( db.equalsIgnoreCase( 'oracle' ) ) {
testRuntimeOnly dbLibs.oracle
}
} }

4
settings.gradle
View File

@ -217,6 +217,7 @@ dependencyResolutionManagement {
def mssqlVersion = version "mssql", "12.2.0.jre11" def mssqlVersion = version "mssql", "12.2.0.jre11"
def mysqlVersion = version "mysql", "8.0.33" def mysqlVersion = version "mysql", "8.0.33"
def oracleVersion = version "oracle", "23.2.0.0" def oracleVersion = version "oracle", "23.2.0.0"
def oracleLegacyVersion = version "oracleLegacy", "11.2.0.4"
def pgsqlVersion = version "pgsql", "42.6.0" def pgsqlVersion = version "pgsql", "42.6.0"
def sybaseVersion = version "sybase", "1.3.1" def sybaseVersion = version "sybase", "1.3.1"
def tidbVersion = version "tidb", mysqlVersion def tidbVersion = version "tidb", mysqlVersion
@ -233,6 +234,9 @@ dependencyResolutionManagement {
library( "oracle", "com.oracle.database.jdbc", "ojdbc11" ).versionRef( oracleVersion ) library( "oracle", "com.oracle.database.jdbc", "ojdbc11" ).versionRef( oracleVersion )
library( "oracleXml", "com.oracle.database.xml", "xdb" ).versionRef( oracleVersion ) library( "oracleXml", "com.oracle.database.xml", "xdb" ).versionRef( oracleVersion )
library( "oracleXmlParser", "com.oracle.database.xml", "xmlparserv2" ).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( "mssql", "com.microsoft.sqlserver", "mssql-jdbc" ).versionRef( mssqlVersion )
library( "db2", "com.ibm.db2", "jcc" ).versionRef( db2Version ) library( "db2", "com.ibm.db2", "jcc" ).versionRef( db2Version )
library( "hana", "com.sap.cloud.db.jdbc", "ngdbc" ).versionRef( hanaVersion ) library( "hana", "com.sap.cloud.db.jdbc", "ngdbc" ).versionRef( hanaVersion )