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

Drop ojdbc6 usage for Oracle 11 testing

This commit is contained in:
Christian Beikov 2023-10-09 15:26:38 +02:00
parent ce550cfb86
commit de5f8a051b
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/build.sh
View File

@ -50,7 +50,7 @@ elif [ "$RDBMS" == "oracle_db23c" ]; then
# I have no idea why, but these tests don't seem to work on CI... # I have no idea why, but these tests don't seem to work on CI...
goal="-Pdb=oracle_cloud_db23c -DrunID=$RUNID -DdbHost=$HOST -DdbService=$SERVICE" goal="-Pdb=oracle_cloud_db23c -DrunID=$RUNID -DdbHost=$HOST -DdbService=$SERVICE"
elif [ "$RDBMS" == "oracle_11_2" ]; then elif [ "$RDBMS" == "oracle_11_2" ]; then
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

13
gradle/java-module.gradle
View File

@ -122,16 +122,9 @@ dependencies {
testRuntimeOnly dbLibs.firebird testRuntimeOnly dbLibs.firebird
} }
else if ( db.startsWith( 'oracle' ) ) { else if ( db.startsWith( 'oracle' ) ) {
if ( db.startsWith( 'oracle_legacy' ) ) { testRuntimeOnly dbLibs.oracle
testRuntimeOnly dbLibs.oracleLegacy testRuntimeOnly dbLibs.oracleXml
testRuntimeOnly dbLibs.oracleLegacyXml testRuntimeOnly dbLibs.oracleXmlParser
testRuntimeOnly dbLibs.oracleLegacyXmlParser
}
else {
testRuntimeOnly dbLibs.oracle
testRuntimeOnly dbLibs.oracleXml
testRuntimeOnly dbLibs.oracleXmlParser
}
} }
annotationProcessor libs.loggingProcessor annotationProcessor libs.loggingProcessor

3
settings.gradle
View File

@ -236,9 +236,6 @@ 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 )