From 726cef314ae7a15fad2e548f651378f47b74e4cd Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Thu, 12 Sep 2024 19:06:11 +0900 Subject: [PATCH 1/2] sqlserver plugin supports driver_path option --- embulk-input-sqlserver/build.gradle | 2 +- embulk-input-sqlserver/gradle.lockfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/embulk-input-sqlserver/build.gradle b/embulk-input-sqlserver/build.gradle index 6f994546..2ecd4c34 100644 --- a/embulk-input-sqlserver/build.gradle +++ b/embulk-input-sqlserver/build.gradle @@ -1,6 +1,6 @@ dependencies { implementation(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) - implementation "com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8" + defaultJdbcDriver "com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8" implementation("com.microsoft.azure:adal4j:1.6.7") { exclude group: 'org.slf4j', module: 'slf4j-api' exclude group: "org.apache.commons", module: "commons-lang3" diff --git a/embulk-input-sqlserver/gradle.lockfile b/embulk-input-sqlserver/gradle.lockfile index 868df87e..24850e81 100644 --- a/embulk-input-sqlserver/gradle.lockfile +++ b/embulk-input-sqlserver/gradle.lockfile @@ -8,7 +8,6 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runt com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspath com.google.code.gson:gson:2.8.0=compileClasspath,runtimeClasspath com.microsoft.azure:adal4j:1.6.7=compileClasspath,runtimeClasspath -com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8=compileClasspath,runtimeClasspath com.nimbusds:content-type:2.1=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.5=compileClasspath,runtimeClasspath com.nimbusds:nimbus-jose-jwt:9.8.1=compileClasspath,runtimeClasspath From 0348f9ac84af80ef6c8a42c0fe195cbbae10c034 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Fri, 13 Sep 2024 09:55:34 +0900 Subject: [PATCH 2/2] Use JDBC driver in compileOnly scope --- embulk-input-sqlserver/build.gradle | 1 + embulk-input-sqlserver/gradle.lockfile | 1 + 2 files changed, 2 insertions(+) diff --git a/embulk-input-sqlserver/build.gradle b/embulk-input-sqlserver/build.gradle index 2ecd4c34..f92b696c 100644 --- a/embulk-input-sqlserver/build.gradle +++ b/embulk-input-sqlserver/build.gradle @@ -1,5 +1,6 @@ dependencies { implementation(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) + compileOnly "com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8" defaultJdbcDriver "com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8" implementation("com.microsoft.azure:adal4j:1.6.7") { exclude group: 'org.slf4j', module: 'slf4j-api' diff --git a/embulk-input-sqlserver/gradle.lockfile b/embulk-input-sqlserver/gradle.lockfile index 24850e81..2f834fc7 100644 --- a/embulk-input-sqlserver/gradle.lockfile +++ b/embulk-input-sqlserver/gradle.lockfile @@ -8,6 +8,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runt com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspath com.google.code.gson:gson:2.8.0=compileClasspath,runtimeClasspath com.microsoft.azure:adal4j:1.6.7=compileClasspath,runtimeClasspath +com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8=compileClasspath com.nimbusds:content-type:2.1=compileClasspath,runtimeClasspath com.nimbusds:lang-tag:1.5=compileClasspath,runtimeClasspath com.nimbusds:nimbus-jose-jwt:9.8.1=compileClasspath,runtimeClasspath