diff --git a/build.gradle b/build.gradle index 409098f..9bc3265 100644 --- a/build.gradle +++ b/build.gradle @@ -33,10 +33,9 @@ java { } dependencies { - compileOnly "org.embulk:embulk-api:0.10.28" - compileOnly "org.embulk:embulk-spi:0.10.28" + compileOnly "org.embulk:embulk-spi:0.11" - implementation("org.embulk:embulk-util-config:0.3.2") { + implementation("org.embulk:embulk-util-config:0.3.4") { // They conflict with embulk-core. They are once excluded here, // and added explicitly with versions exactly the same with embulk-core:0.10.28. exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations" @@ -50,21 +49,22 @@ dependencies { // and added explicitly with versions exactly the same with embulk-core:0.10.28. 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.core:jackson-databind:2.6.7.5" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7" implementation "javax.validation:validation-api:1.1.0.Final" implementation "org.embulk:embulk-base-restclient:0.10.1" implementation "org.embulk:embulk-util-retryhelper-jetty92:0.8.2" - implementation "org.embulk:embulk-util-timestamp:0.2.1" + implementation "org.embulk:embulk-util-timestamp:0.2.2" testImplementation "junit:junit:4.13.2" - testImplementation "org.embulk:embulk-core:0.10.28" - testImplementation "org.embulk:embulk-core:0.10.28:tests" - testImplementation "org.embulk:embulk-standards:0.10.28" - testImplementation "org.embulk:embulk-junit4:0.10.28" - testImplementation "org.embulk:embulk-deps:0.10.28" + testImplementation "org.embulk:embulk-core:0.11.2" + testImplementation "org.embulk:embulk-deps:0.11.2" + testImplementation "org.embulk:embulk-junit4:0.11.2" + testImplementation "org.embulk:embulk-input-file:0.11.0" + testImplementation "org.embulk:embulk-parser-csv:0.11.4" + testImplementation "com.google.guava:guava:18.0" } embulkPlugin { diff --git a/gradle.lockfile b/gradle.lockfile index 5178d4d..af76559 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -3,22 +3,21 @@ # 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.core:jackson-databind:2.6.7.5=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.eclipse.jetty:jetty-client:9.2.14.v20151106=compileClasspath,runtimeClasspath org.eclipse.jetty:jetty-http:9.2.14.v20151106=compileClasspath,runtimeClasspath org.eclipse.jetty:jetty-io:9.2.14.v20151106=compileClasspath,runtimeClasspath org.eclipse.jetty:jetty-util:9.2.14.v20151106=compileClasspath,runtimeClasspath -org.embulk:embulk-api:0.10.28=compileClasspath org.embulk:embulk-base-restclient:0.10.1=compileClasspath,runtimeClasspath -org.embulk:embulk-spi:0.10.28=compileClasspath -org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath +org.embulk:embulk-spi:0.11=compileClasspath +org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath org.embulk:embulk-util-retryhelper-jetty92:0.8.2=compileClasspath,runtimeClasspath org.embulk:embulk-util-retryhelper:0.8.2=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 +org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath +org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath +org.msgpack:msgpack-core:0.8.24=compileClasspath +org.slf4j:slf4j-api:2.0.7=compileClasspath empty= diff --git a/src/test/java/org/embulk/output/elasticsearch/ElasticsearchTestUtils.java b/src/test/java/org/embulk/output/elasticsearch/ElasticsearchTestUtils.java index 877cd1a..1b580d5 100644 --- a/src/test/java/org/embulk/output/elasticsearch/ElasticsearchTestUtils.java +++ b/src/test/java/org/embulk/output/elasticsearch/ElasticsearchTestUtils.java @@ -18,11 +18,11 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.embulk.EmbulkTestRuntime; import org.embulk.config.ConfigSource; import org.embulk.output.elasticsearch.ElasticsearchOutputPluginDelegate.PluginTask; import org.embulk.spi.Schema; import org.embulk.spi.type.Types; +import org.embulk.test.EmbulkTestRuntime; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchHttpClient.java b/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchHttpClient.java index e89c62e..019d3f9 100644 --- a/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchHttpClient.java +++ b/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchHttpClient.java @@ -17,12 +17,12 @@ package org.embulk.output.elasticsearch; import org.eclipse.jetty.http.HttpMethod; -import org.embulk.EmbulkTestRuntime; import org.embulk.config.ConfigException; import org.embulk.config.ConfigSource; import org.embulk.output.elasticsearch.ElasticsearchOutputPluginDelegate.PluginTask; import org.embulk.spi.Exec; import org.embulk.spi.time.Timestamp; +import org.embulk.test.EmbulkTestRuntime; import org.embulk.util.config.ConfigMapper; import org.embulk.util.config.ConfigMapperFactory; import org.junit.Before; diff --git a/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPlugin.java b/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPlugin.java index 4a54715..0351b1a 100644 --- a/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPlugin.java +++ b/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPlugin.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; import org.eclipse.jetty.http.HttpMethod; -import org.embulk.EmbulkTestRuntime; import org.embulk.config.ConfigException; import org.embulk.config.ConfigSource; import org.embulk.config.TaskReport; @@ -30,11 +29,12 @@ import org.embulk.spi.Exec; import org.embulk.spi.OutputPlugin; import org.embulk.spi.Page; -import org.embulk.spi.PageTestUtils; import org.embulk.spi.Schema; import org.embulk.spi.TransactionalPageOutput; import org.embulk.spi.time.Timestamp; -import org.embulk.standards.CsvParserPlugin; +import org.embulk.parser.csv.CsvParserPlugin; +import org.embulk.test.EmbulkTestRuntime; +import org.embulk.test.PageTestUtils; import org.embulk.util.config.ConfigMapper; import org.junit.Before; import org.junit.Rule; diff --git a/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPluginJSON.java b/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPluginJSON.java index 63292e9..9ad0ec2 100644 --- a/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPluginJSON.java +++ b/src/test/java/org/embulk/output/elasticsearch/TestElasticsearchOutputPluginJSON.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Lists; import org.eclipse.jetty.http.HttpMethod; -import org.embulk.EmbulkTestRuntime; import org.embulk.config.ConfigException; import org.embulk.config.ConfigSource; import org.embulk.config.TaskReport; @@ -30,9 +29,10 @@ import org.embulk.spi.Exec; import org.embulk.spi.OutputPlugin; import org.embulk.spi.Page; -import org.embulk.spi.PageTestUtils; import org.embulk.spi.Schema; import org.embulk.spi.TransactionalPageOutput; +import org.embulk.test.EmbulkTestRuntime; +import org.embulk.test.PageTestUtils; import org.embulk.util.config.ConfigMapper; import org.embulk.util.config.ConfigMapperFactory; import org.junit.Before;