diff --git a/build.gradle b/build.gradle index bc3c5b74..63b2a94e 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id "maven-publish" id "signing" id 'checkstyle' - id "org.embulk.embulk-plugins" version "0.5.5" apply false + id "org.embulk.embulk-plugins" version "0.6.1" apply false } allprojects { @@ -28,17 +28,20 @@ subprojects { configurations { defaultJdbcDriver + compileClasspath.resolutionStrategy.activateDependencyLocking() + runtimeClasspath.resolutionStrategy.activateDependencyLocking() } - sourceCompatibility = 1.8 - targetCompatibility = 1.8 - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" + options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked" options.encoding = "UTF-8" } java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } + withJavadocJar() withSourcesJar() } @@ -47,7 +50,7 @@ subprojects { compileOnly "org.embulk:embulk-api:0.10.36" compileOnly "org.embulk:embulk-spi:0.10.36" - compile("org.embulk:embulk-util-config:0.3.2") { + implementation("org.embulk:embulk-util-config:0.3.2") { // They conflict with embulk-core. They are once excluded here, // and added explicitly with versions exactly the same with older embulk-core (until v0.10.31). exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations" @@ -59,18 +62,18 @@ subprojects { // They are once excluded from transitive dependencies of other dependencies, // and added explicitly with versions exactly the same with older embulk-core (until 0.10.31). - compile "com.fasterxml.jackson.core:jackson-annotations:2.6.7" - compile "com.fasterxml.jackson.core:jackson-core:2.6.7" - compile "com.fasterxml.jackson.core:jackson-databind:2.6.7" - compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7" - compile "javax.validation:validation-api:1.1.0.Final" + implementation "com.fasterxml.jackson.core:jackson-annotations:2.6.7" + implementation "com.fasterxml.jackson.core:jackson-core:2.6.7" + implementation "com.fasterxml.jackson.core:jackson-databind:2.6.7" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7" + implementation "javax.validation:validation-api:1.1.0.Final" - compile "org.embulk:embulk-util-json:0.1.1" - compile "org.embulk:embulk-util-timestamp:0.2.1" + implementation "org.embulk:embulk-util-json:0.1.1" + implementation "org.embulk:embulk-util-timestamp:0.2.1" - testCompile "org.embulk:embulk-junit4:0.10.36" - testCompile "org.embulk:embulk-core:0.10.36" - testCompile "org.embulk:embulk-deps:0.10.36" + testImplementation "org.embulk:embulk-junit4:0.10.36" + testImplementation "org.embulk:embulk-core:0.10.36" + testImplementation "org.embulk:embulk-deps:0.10.36" } javadoc { @@ -80,73 +83,23 @@ subprojects { } } - test { - // JDBC input plugins depend on local time zone to parse timestamp without time stamp and datetime types. - jvmArgs "-Duser.country=FI", "-Duser.timezone=Europe/Helsinki" - environment "TZ", "Europe/Helsinki" - } - - tasks.withType(Test) { - testLogging { - // set options for log level LIFECYCLE - events TestLogEvent.FAILED, - TestLogEvent.PASSED, - TestLogEvent.SKIPPED, - TestLogEvent.STANDARD_OUT - exceptionFormat TestExceptionFormat.FULL - showExceptions true - showCauses true - showStackTraces true - - afterSuite { desc, result -> - if (!desc.parent) { // will match the outermost suite - def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)" - def startItem = '| ', endItem = ' |' - def repeatLength = startItem.length() + output.length() + endItem.length() - println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength)) - } - } + // A safer and strict alternative to: "dependencies" (and "dependencies --write-locks") + // + // This task fails explicitly when the specified dependency is not available. + // In contrast, "dependencies (--write-locks)" does not fail even when a part the dependencies are unavailable. + // + // https://docs.gradle.org/7.6.1/userguide/dependency_locking.html#generating_and_updating_dependency_locks + task checkDependencies { + notCompatibleWithConfigurationCache("The task \"checkDependencies\" filters configurations at execution time.") + doLast { + configurations.findAll { it.canBeResolved }.each { it.resolve() } } } - checkstyle { - configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml") - toolVersion = '6.14.1' - } - checkstyleMain { - configFile = file("${project.rootDir}/config/checkstyle/default.xml") - ignoreFailures = true - } - checkstyleTest { - configFile = file("${project.rootDir}/config/checkstyle/default.xml") - ignoreFailures = true - } - task checkstyle(type: Checkstyle) { - classpath = sourceSets.main.output + sourceSets.test.output - source = sourceSets.main.allJava + sourceSets.test.allJava - } - - gem { - authors = [ "Sadayuki Furuhashi" ] - email = [ "frsyuki@gmail.com" ] - summary = "JDBC input plugin for Embulk" - homepage = "https://github.com/embulk/embulk-input-jdbc" - licenses = [ "Apache-2.0" ] - - into("default_jdbc_driver") { - from configurations.defaultJdbcDriver - } - } - - gemPush { - host = "https://rubygems.org" - } - - javadoc { - options { - locale = 'en_US' - encoding = 'UTF-8' - } + // It should not publish a `.module` file in Maven Central. + // https://docs.gradle.org/current/userguide/publishing_gradle_module_metadata.html#sub:disabling-gmm-publication + tasks.withType(GenerateModuleMetadata) { + enabled = false } publishing { @@ -173,6 +126,7 @@ subprojects { // http://central.sonatype.org/pages/requirements.html#license-information name = "The Apache License, Version 2.0" url = "https://www.apache.org/licenses/LICENSE-2.0.txt" + distribution = "repo" } } @@ -205,6 +159,72 @@ subprojects { } signing { + if (project.hasProperty("signingKey") && project.hasProperty("signingPassword")) { + logger.lifecycle("Signing with an in-memory key.") + useInMemoryPgpKeys(signingKey, signingPassword) + } sign publishing.publications.maven } + + gem { + authors = [ "Sadayuki Furuhashi" ] + email = [ "frsyuki@gmail.com" ] + summary = "JDBC input plugin for Embulk" + homepage = "https://github.com/embulk/embulk-input-jdbc" + licenses = [ "Apache-2.0" ] + + into("default_jdbc_driver") { + from configurations.defaultJdbcDriver + } + } + + gemPush { + host = "https://rubygems.org" + } + + test { + // JDBC input plugins depend on local time zone to parse timestamp without time stamp and datetime types. + jvmArgs "-Duser.country=FI", "-Duser.timezone=Europe/Helsinki" + environment "TZ", "Europe/Helsinki" + } + + tasks.withType(Test) { + testLogging { + // set options for log level LIFECYCLE + events TestLogEvent.FAILED, + TestLogEvent.PASSED, + TestLogEvent.SKIPPED, + TestLogEvent.STANDARD_OUT + exceptionFormat TestExceptionFormat.FULL + showExceptions true + showCauses true + showStackTraces true + + afterSuite { desc, result -> + if (!desc.parent) { // will match the outermost suite + def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)" + def startItem = '| ', endItem = ' |' + def repeatLength = startItem.length() + output.length() + endItem.length() + println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength)) + } + } + } + } + + checkstyle { + configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml") + toolVersion = '6.14.1' + } + checkstyleMain { + configFile = file("${project.rootDir}/config/checkstyle/default.xml") + ignoreFailures = true + } + checkstyleTest { + configFile = file("${project.rootDir}/config/checkstyle/default.xml") + ignoreFailures = true + } + task checkstyle(type: Checkstyle) { + classpath = sourceSets.main.output + sourceSets.test.output + source = sourceSets.main.allJava + sourceSets.test.allJava + } } diff --git a/embulk-input-jdbc/gradle.lockfile b/embulk-input-jdbc/gradle.lockfile new file mode 100644 index 00000000..da09d9cc --- /dev/null +++ b/embulk-input-jdbc/gradle.lockfile @@ -0,0 +1,17 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath +javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath +org.embulk:embulk-api:0.10.36=compileClasspath +org.embulk:embulk-spi:0.10.36=compileClasspath +org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath +org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath +org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath +org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath +org.msgpack:msgpack-core:0.8.11=compileClasspath +org.slf4j:slf4j-api:1.7.30=compileClasspath +empty= diff --git a/embulk-input-jdbc/gradle/dependency-locks/compileClasspath.lockfile b/embulk-input-jdbc/gradle/dependency-locks/compileClasspath.lockfile deleted file mode 100644 index 59c07524..00000000 --- a/embulk-input-jdbc/gradle/dependency-locks/compileClasspath.lockfile +++ /dev/null @@ -1,15 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -org.embulk:embulk-api:0.10.36 -org.embulk:embulk-spi:0.10.36 -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-timestamp:0.2.1 -org.msgpack:msgpack-core:0.8.11 -org.slf4j:slf4j-api:1.7.30 diff --git a/embulk-input-jdbc/gradle/dependency-locks/runtimeClasspath.lockfile b/embulk-input-jdbc/gradle/dependency-locks/runtimeClasspath.lockfile deleted file mode 100644 index 3ef7f999..00000000 --- a/embulk-input-jdbc/gradle/dependency-locks/runtimeClasspath.lockfile +++ /dev/null @@ -1,12 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-rubytime:0.3.2 -org.embulk:embulk-util-timestamp:0.2.1 diff --git a/embulk-input-mysql/build.gradle b/embulk-input-mysql/build.gradle index 657b6bf3..2c3df8a1 100644 --- a/embulk-input-mysql/build.gradle +++ b/embulk-input-mysql/build.gradle @@ -1,16 +1,16 @@ dependencies { - compile(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) + implementation(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) compileOnly "mysql:mysql-connector-java:5.1.44" defaultJdbcDriver 'mysql:mysql-connector-java:5.1.44' - testCompile "com.google.guava:guava:18.0" - testCompile "org.embulk:embulk-formatter-csv:0.10.36" - testCompile "org.embulk:embulk-input-file:0.10.36" - testCompile "org.embulk:embulk-output-file:0.10.36" - testCompile "org.embulk:embulk-parser-csv:0.10.36" + testImplementation "com.google.guava:guava:18.0" + testImplementation "org.embulk:embulk-formatter-csv:0.10.36" + testImplementation "org.embulk:embulk-input-file:0.10.36" + testImplementation "org.embulk:embulk-output-file:0.10.36" + testImplementation "org.embulk:embulk-parser-csv:0.10.36" - testCompile "mysql:mysql-connector-java:5.1.44" + testImplementation "mysql:mysql-connector-java:5.1.44" } embulkPlugin { diff --git a/embulk-input-mysql/gradle.lockfile b/embulk-input-mysql/gradle.lockfile new file mode 100644 index 00000000..6e13409f --- /dev/null +++ b/embulk-input-mysql/gradle.lockfile @@ -0,0 +1,18 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath +javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath +mysql:mysql-connector-java:5.1.44=compileClasspath +org.embulk:embulk-api:0.10.36=compileClasspath +org.embulk:embulk-spi:0.10.36=compileClasspath +org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath +org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath +org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath +org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath +org.msgpack:msgpack-core:0.8.11=compileClasspath +org.slf4j:slf4j-api:1.7.30=compileClasspath +empty= diff --git a/embulk-input-mysql/gradle/dependency-locks/compileClasspath.lockfile b/embulk-input-mysql/gradle/dependency-locks/compileClasspath.lockfile deleted file mode 100644 index 22b3cb54..00000000 --- a/embulk-input-mysql/gradle/dependency-locks/compileClasspath.lockfile +++ /dev/null @@ -1,16 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -mysql:mysql-connector-java:5.1.44 -org.embulk:embulk-api:0.10.36 -org.embulk:embulk-spi:0.10.36 -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-timestamp:0.2.1 -org.msgpack:msgpack-core:0.8.11 -org.slf4j:slf4j-api:1.7.30 diff --git a/embulk-input-mysql/gradle/dependency-locks/runtimeClasspath.lockfile b/embulk-input-mysql/gradle/dependency-locks/runtimeClasspath.lockfile deleted file mode 100644 index 3ef7f999..00000000 --- a/embulk-input-mysql/gradle/dependency-locks/runtimeClasspath.lockfile +++ /dev/null @@ -1,12 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-rubytime:0.3.2 -org.embulk:embulk-util-timestamp:0.2.1 diff --git a/embulk-input-postgresql/build.gradle b/embulk-input-postgresql/build.gradle index 83e18979..42c45287 100644 --- a/embulk-input-postgresql/build.gradle +++ b/embulk-input-postgresql/build.gradle @@ -1,16 +1,16 @@ dependencies { - compile(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) + implementation(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) compileOnly "org.postgresql:postgresql:9.4-1205-jdbc41" defaultJdbcDriver 'org.postgresql:postgresql:9.4-1205-jdbc41' - testCompile "com.google.guava:guava:18.0" - testCompile "org.embulk:embulk-formatter-csv:0.10.36" - testCompile "org.embulk:embulk-input-file:0.10.36" - testCompile "org.embulk:embulk-output-file:0.10.36" - testCompile "org.embulk:embulk-parser-csv:0.10.36" + testImplementation "com.google.guava:guava:18.0" + testImplementation "org.embulk:embulk-formatter-csv:0.10.36" + testImplementation "org.embulk:embulk-input-file:0.10.36" + testImplementation "org.embulk:embulk-output-file:0.10.36" + testImplementation "org.embulk:embulk-parser-csv:0.10.36" - testCompile "org.postgresql:postgresql:9.4-1205-jdbc41" + testImplementation "org.postgresql:postgresql:9.4-1205-jdbc41" } embulkPlugin { diff --git a/embulk-input-postgresql/gradle.lockfile b/embulk-input-postgresql/gradle.lockfile new file mode 100644 index 00000000..e892354e --- /dev/null +++ b/embulk-input-postgresql/gradle.lockfile @@ -0,0 +1,18 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath +javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath +org.embulk:embulk-api:0.10.36=compileClasspath +org.embulk:embulk-spi:0.10.36=compileClasspath +org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath +org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath +org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath +org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath +org.msgpack:msgpack-core:0.8.11=compileClasspath +org.postgresql:postgresql:9.4-1205-jdbc41=compileClasspath +org.slf4j:slf4j-api:1.7.30=compileClasspath +empty= diff --git a/embulk-input-postgresql/gradle/dependency-locks/compileClasspath.lockfile b/embulk-input-postgresql/gradle/dependency-locks/compileClasspath.lockfile deleted file mode 100644 index a285f577..00000000 --- a/embulk-input-postgresql/gradle/dependency-locks/compileClasspath.lockfile +++ /dev/null @@ -1,16 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -org.embulk:embulk-api:0.10.36 -org.embulk:embulk-spi:0.10.36 -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-timestamp:0.2.1 -org.msgpack:msgpack-core:0.8.11 -org.postgresql:postgresql:9.4-1205-jdbc41 -org.slf4j:slf4j-api:1.7.30 diff --git a/embulk-input-postgresql/gradle/dependency-locks/runtimeClasspath.lockfile b/embulk-input-postgresql/gradle/dependency-locks/runtimeClasspath.lockfile deleted file mode 100644 index 3ef7f999..00000000 --- a/embulk-input-postgresql/gradle/dependency-locks/runtimeClasspath.lockfile +++ /dev/null @@ -1,12 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-rubytime:0.3.2 -org.embulk:embulk-util-timestamp:0.2.1 diff --git a/embulk-input-redshift/build.gradle b/embulk-input-redshift/build.gradle index 1260dba2..da134df2 100644 --- a/embulk-input-redshift/build.gradle +++ b/embulk-input-redshift/build.gradle @@ -1,15 +1,15 @@ dependencies { - compile(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) - compile(project(path: ":embulk-input-postgresql", configuration: "runtimeElements")) - compile "org.postgresql:postgresql:9.4-1205-jdbc41" + implementation(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) + implementation(project(path: ":embulk-input-postgresql", configuration: "runtimeElements")) + implementation "org.postgresql:postgresql:9.4-1205-jdbc41" - testCompile project(':embulk-input-jdbc').sourceSets.test.output + testImplementation project(":embulk-input-jdbc").sourceSets.test.output - testCompile "com.google.guava:guava:18.0" - testCompile "org.embulk:embulk-formatter-csv:0.10.36" - testCompile "org.embulk:embulk-input-file:0.10.36" - testCompile "org.embulk:embulk-output-file:0.10.36" - testCompile "org.embulk:embulk-parser-csv:0.10.36" + testImplementation "com.google.guava:guava:18.0" + testImplementation "org.embulk:embulk-formatter-csv:0.10.36" + testImplementation "org.embulk:embulk-input-file:0.10.36" + testImplementation "org.embulk:embulk-output-file:0.10.36" + testImplementation "org.embulk:embulk-parser-csv:0.10.36" } embulkPlugin { diff --git a/embulk-input-redshift/gradle.lockfile b/embulk-input-redshift/gradle.lockfile new file mode 100644 index 00000000..fb4ee897 --- /dev/null +++ b/embulk-input-redshift/gradle.lockfile @@ -0,0 +1,18 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath +javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath +org.embulk:embulk-api:0.10.36=compileClasspath +org.embulk:embulk-spi:0.10.36=compileClasspath +org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath +org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath +org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath +org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath +org.msgpack:msgpack-core:0.8.11=compileClasspath +org.postgresql:postgresql:9.4-1205-jdbc41=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.30=compileClasspath +empty= diff --git a/embulk-input-redshift/gradle/dependency-locks/compileClasspath.lockfile b/embulk-input-redshift/gradle/dependency-locks/compileClasspath.lockfile deleted file mode 100644 index a285f577..00000000 --- a/embulk-input-redshift/gradle/dependency-locks/compileClasspath.lockfile +++ /dev/null @@ -1,16 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -org.embulk:embulk-api:0.10.36 -org.embulk:embulk-spi:0.10.36 -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-timestamp:0.2.1 -org.msgpack:msgpack-core:0.8.11 -org.postgresql:postgresql:9.4-1205-jdbc41 -org.slf4j:slf4j-api:1.7.30 diff --git a/embulk-input-redshift/gradle/dependency-locks/runtimeClasspath.lockfile b/embulk-input-redshift/gradle/dependency-locks/runtimeClasspath.lockfile deleted file mode 100644 index 8bff0749..00000000 --- a/embulk-input-redshift/gradle/dependency-locks/runtimeClasspath.lockfile +++ /dev/null @@ -1,13 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -javax.validation:validation-api:1.1.0.Final -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-rubytime:0.3.2 -org.embulk:embulk-util-timestamp:0.2.1 -org.postgresql:postgresql:9.4-1205-jdbc41 diff --git a/embulk-input-sqlserver/build.gradle b/embulk-input-sqlserver/build.gradle index 29006b1d..f4e989b3 100644 --- a/embulk-input-sqlserver/build.gradle +++ b/embulk-input-sqlserver/build.gradle @@ -1,18 +1,18 @@ dependencies { - compile(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) - compile 'com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8' - compile('com.microsoft.azure:adal4j:1.6.7') { + implementation(project(path: ":embulk-input-jdbc", configuration: "runtimeElements")) + implementation "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" } - compile 'net.sourceforge.jtds:jtds:1.3.1' - compile "org.apache.commons:commons-lang3:3.4" + implementation "net.sourceforge.jtds:jtds:1.3.1" + implementation "org.apache.commons:commons-lang3:3.4" - testCompile "com.google.guava:guava:18.0" - testCompile "org.embulk:embulk-formatter-csv:0.10.36" - testCompile "org.embulk:embulk-input-file:0.10.36" - testCompile "org.embulk:embulk-output-file:0.10.36" - testCompile "org.embulk:embulk-parser-csv:0.10.36" + testImplementation "com.google.guava:guava:18.0" + testImplementation "org.embulk:embulk-formatter-csv:0.10.36" + testImplementation "org.embulk:embulk-input-file:0.10.36" + testImplementation "org.embulk:embulk-output-file:0.10.36" + testImplementation "org.embulk:embulk-parser-csv:0.10.36" } embulkPlugin { diff --git a/embulk-input-sqlserver/gradle.lockfile b/embulk-input-sqlserver/gradle.lockfile new file mode 100644 index 00000000..7b9d0ad4 --- /dev/null +++ b/embulk-input-sqlserver/gradle.lockfile @@ -0,0 +1,31 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath +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 +com.nimbusds:oauth2-oidc-sdk:9.4=compileClasspath,runtimeClasspath +commons-codec:commons-codec:1.14=compileClasspath,runtimeClasspath +javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath +net.minidev:accessors-smart:2.4.2=compileClasspath,runtimeClasspath +net.minidev:json-smart:2.4.2=compileClasspath,runtimeClasspath +net.sourceforge.jtds:jtds:1.3.1=compileClasspath,runtimeClasspath +org.apache.commons:commons-lang3:3.4=compileClasspath,runtimeClasspath +org.embulk:embulk-api:0.10.36=compileClasspath +org.embulk:embulk-spi:0.10.36=compileClasspath +org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath +org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath +org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath +org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath +org.msgpack:msgpack-core:0.8.11=compileClasspath +org.ow2.asm:asm:8.0.1=compileClasspath,runtimeClasspath +org.slf4j:slf4j-api:1.7.30=compileClasspath +empty= diff --git a/embulk-input-sqlserver/gradle/dependency-locks/compileClasspath.lockfile b/embulk-input-sqlserver/gradle/dependency-locks/compileClasspath.lockfile deleted file mode 100644 index 84713b62..00000000 --- a/embulk-input-sqlserver/gradle/dependency-locks/compileClasspath.lockfile +++ /dev/null @@ -1,29 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -com.github.stephenc.jcip:jcip-annotations:1.0-1 -com.google.code.gson:gson:2.8.0 -com.microsoft.azure:adal4j:1.6.7 -com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8 -com.nimbusds:content-type:2.1 -com.nimbusds:lang-tag:1.5 -com.nimbusds:nimbus-jose-jwt:9.8.1 -com.nimbusds:oauth2-oidc-sdk:9.4 -commons-codec:commons-codec:1.14 -javax.validation:validation-api:1.1.0.Final -net.minidev:accessors-smart:2.4.2 -net.minidev:json-smart:2.4.2 -net.sourceforge.jtds:jtds:1.3.1 -org.apache.commons:commons-lang3:3.4 -org.embulk:embulk-api:0.10.36 -org.embulk:embulk-spi:0.10.36 -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-timestamp:0.2.1 -org.msgpack:msgpack-core:0.8.11 -org.ow2.asm:asm:8.0.1 -org.slf4j:slf4j-api:1.7.30 diff --git a/embulk-input-sqlserver/gradle/dependency-locks/runtimeClasspath.lockfile b/embulk-input-sqlserver/gradle/dependency-locks/runtimeClasspath.lockfile deleted file mode 100644 index 0e7a32ea..00000000 --- a/embulk-input-sqlserver/gradle/dependency-locks/runtimeClasspath.lockfile +++ /dev/null @@ -1,26 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -com.fasterxml.jackson.core:jackson-annotations:2.6.7 -com.fasterxml.jackson.core:jackson-core:2.6.7 -com.fasterxml.jackson.core:jackson-databind:2.6.7 -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7 -com.github.stephenc.jcip:jcip-annotations:1.0-1 -com.google.code.gson:gson:2.8.0 -com.microsoft.azure:adal4j:1.6.7 -com.microsoft.sqlserver:mssql-jdbc:7.2.2.jre8 -com.nimbusds:content-type:2.1 -com.nimbusds:lang-tag:1.5 -com.nimbusds:nimbus-jose-jwt:9.8.1 -com.nimbusds:oauth2-oidc-sdk:9.4 -commons-codec:commons-codec:1.14 -javax.validation:validation-api:1.1.0.Final -net.minidev:accessors-smart:2.4.2 -net.minidev:json-smart:2.4.2 -net.sourceforge.jtds:jtds:1.3.1 -org.apache.commons:commons-lang3:3.4 -org.embulk:embulk-util-config:0.3.2 -org.embulk:embulk-util-json:0.1.1 -org.embulk:embulk-util-rubytime:0.3.2 -org.embulk:embulk-util-timestamp:0.2.1 -org.ow2.asm:asm:8.0.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a2bf1313..774fae87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists