From a47554039e512fcb59d3207c9c70525d299825d1 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Thu, 9 Aug 2018 12:33:41 +0100 Subject: [PATCH] HHH-12901 Enable loading of additional JDBC drivers from a local path, rename the Oracle dependency --- build.gradle | 7 +++++++ databases/oracle/matrix.gradle | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index beb805c4d6..0094881aad 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,13 @@ allprojects { name "jboss-snapshots" url "http://snapshots.jboss.org/maven2/" } + //Allow loading additional dependencies from a local path; + //useful to load JDBC drivers which can not be distributed in public. + if (System.env['ADDITIONAL_REPO'] != null) { + flatDir { + dirs "${System.env.ADDITIONAL_REPO}" + } + } } apply plugin: 'idea' diff --git a/databases/oracle/matrix.gradle b/databases/oracle/matrix.gradle index b4a64b9e80..2355701ef4 100644 --- a/databases/oracle/matrix.gradle +++ b/databases/oracle/matrix.gradle @@ -4,4 +4,6 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later. * See the lgpl.txt file in the root directory or . */ -jdbcDependency 'com.oracle.ojdbc:ojdbc7:12.1.0.2.0' +// Expected to match the jar name: drop a copy of ojdbc8.jar in a local directory, +// then point the environment variable ADDITIONAL_REPO to that directory. +jdbcDependency name : 'ojdbc8'