Drop ojdbc6 usage for Oracle 11 testing

Author: beikov

ci/build.sh

@@ -52,7 +52,7 @@ elif [ "$RDBMS" == "oracle_db23c" ]; then
   # 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"
 elif [ "$RDBMS" == "oracle_11_2" ]; then
-  goal="-Pdb=oracle_legacy_ci"
+  goal="-Pdb=oracle_legacy_ci -PexcludeTests=**.LockTest.testQueryTimeout*"
 elif [ "$RDBMS" == "db2" ]; then
   goal="-Pdb=db2_ci"
 elif [ "$RDBMS" == "db2_10_5" ]; then

gradle/java-module.gradle

@@ -122,16 +122,9 @@ dependencies {
 		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
-		}
+		testRuntimeOnly dbLibs.oracle
+		testRuntimeOnly dbLibs.oracleXml
+		testRuntimeOnly dbLibs.oracleXmlParser
 	}
 
 	annotationProcessor libs.loggingProcessor

settings.gradle

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