diff --git a/build.gradle b/build.gradle index 87b15040a0..ff1d2ff6cc 100644 --- a/build.gradle +++ b/build.gradle @@ -240,18 +240,6 @@ allprojects { maven { url "$artifactory_contextUrl/corda-dependencies" } maven { url 'https://jitpack.io' } maven { url "$artifactory_contextUrl/corda-releases" } // cordform-common - if (project.hasProperty("mavenOracleUsername") && project.hasProperty("mavenOraclePassword")) { - maven { - // For integrationTest task when running against Oracle database the JDBC driver is in Oracle Maven repository with login access only, - // setup an account on https://login.oracle.com/oaam_server/login.do - // provide credentials to Gradle task by -PmavenOracleUsername=... -PmavenOraclePassword=... - url "https://www.oracle.com/content/secure/maven/content" - credentials { - username = project.property("mavenOracleUsername") - password = project.property("mavenOraclePassword") - } - } - } } configurations { diff --git a/node/build.gradle b/node/build.gradle index b55e337ad0..6fb0a3945d 100644 --- a/node/build.gradle +++ b/node/build.gradle @@ -202,15 +202,7 @@ dependencies { runtime "com.microsoft.sqlserver:mssql-jdbc:6.2.1.jre8" break case "integration-oracle" : - runtime ("com.oracle.jdbc:ojdbc8:12.2.0.1") { //exclude unnecessary or conflicting libraries - exclude group: "com.oracle.jdbc", module: "ucp" - exclude group: "com.oracle.jdbc", module: "ons" - exclude group: "com.oracle.jdbc", module: "xmlparserv2" - exclude group: "com.oracle.jdbc", module: "xdb6" - exclude group: "com.oracle.jdbc", module: "oraclepki" - exclude group: "com.oracle.jdbc", module: "osdt_cert" - exclude group: "com.oracle.jdbc", module: "osdt_core" - } + runtime files("lib/ojdbc8.jar") break case "integration-oracle-11" : runtime files("lib/ojdbc6.jar") diff --git a/node/lib/ojdbc8.jar b/node/lib/ojdbc8.jar new file mode 100644 index 0000000000..bf412434bd Binary files /dev/null and b/node/lib/ojdbc8.jar differ