Skip to content

Commit

Permalink
Upgrade the SPI to 0.11, embulk-util-config to 0.3.4, embulk-util-jso…
Browse files Browse the repository at this point in the history 
…n to 0.3.0, and embulk-util-timestamp to 0.2.2
  • Loading branch information
@dmikurube
dmikurube committed Oct 3, 2023
1 parent ca536ab commit afe984e
Show file tree
Hide file tree
Showing 20 changed files with 74 additions and 80 deletions.
17 changes: 8 additions & 9 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ subprojects {
}

dependencies {
compileOnly "org.embulk:embulk-api:0.10.36"
compileOnly "org.embulk:embulk-spi:0.10.36"
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 older embulk-core (until v0.10.31).
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
Expand All @@ -61,16 +60,16 @@ subprojects {
// and added explicitly with versions exactly the same with older embulk-core (until 0.10.31).
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-util-json:0.1.1"
implementation "org.embulk:embulk-util-timestamp:0.2.1"
implementation "org.embulk:embulk-util-json:0.3.0"
implementation "org.embulk:embulk-util-timestamp:0.2.2"

testImplementation "org.embulk:embulk-junit4:0.10.36"
testImplementation "org.embulk:embulk-core:0.10.36"
testImplementation "org.embulk:embulk-deps:0.10.36"
testImplementation "org.embulk:embulk-junit4:0.11.1"
testImplementation "org.embulk:embulk-core:0.11.1"
testImplementation "org.embulk:embulk-deps:0.11.1"
}

javadoc {
Expand Down
17 changes: 8 additions & 9 deletions embulk-input-jdbc/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@
# 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.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
org.embulk:embulk-spi:0.11=compileClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
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=
8 changes: 4 additions & 4 deletions embulk-input-mysql/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ dependencies {
defaultJdbcDriver 'mysql:mysql-connector-java:5.1.44'

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"
testImplementation "org.embulk:embulk-formatter-csv:0.11.1"
testImplementation "org.embulk:embulk-input-file:0.11.0"
testImplementation "org.embulk:embulk-output-file:0.11.0"
testImplementation "org.embulk:embulk-parser-csv:0.11.3"

testImplementation "mysql:mysql-connector-java:5.1.44"
}
Expand Down
17 changes: 8 additions & 9 deletions embulk-input-mysql/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
# 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
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
org.embulk:embulk-spi:0.11=compileClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
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=
2 changes: 1 addition & 1 deletion embulk-input-mysql/src/test/java/org/embulk/input/mysql/BasicTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

public class BasicTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/mysql/test/expect/basic/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/mysql/test/expect/basic/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
2 changes: 1 addition & 1 deletion embulk-input-mysql/src/test/java/org/embulk/input/mysql/IncrementalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

public class IncrementalTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/mysql/test/expect/incremental/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/mysql/test/expect/incremental/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
2 changes: 1 addition & 1 deletion embulk-input-mysql/src/test/java/org/embulk/input/mysql/OptionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

public class OptionTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/mysql/test/expect/option/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/mysql/test/expect/option/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
8 changes: 4 additions & 4 deletions embulk-input-postgresql/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ dependencies {
defaultJdbcDriver 'org.postgresql:postgresql:9.4-1205-jdbc41'

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"
testImplementation "org.embulk:embulk-formatter-csv:0.11.1"
testImplementation "org.embulk:embulk-input-file:0.11.0"
testImplementation "org.embulk:embulk-output-file:0.11.0"
testImplementation "org.embulk:embulk-parser-csv:0.11.3"

testImplementation "org.postgresql:postgresql:9.4-1205-jdbc41"
}
Expand Down
17 changes: 8 additions & 9 deletions embulk-input-postgresql/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
# 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.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.embulk:embulk-spi:0.11=compileClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
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.postgresql:postgresql:9.4-1205-jdbc41=compileClasspath
org.slf4j:slf4j-api:1.7.30=compileClasspath
org.slf4j:slf4j-api:2.0.7=compileClasspath
empty=
2 changes: 1 addition & 1 deletion embulk-input-postgresql/src/test/java/org/embulk/input/postgresql/ArrayTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

public class ArrayTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/postgresql/test/expect/array/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/postgresql/test/expect/array/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
2 changes: 1 addition & 1 deletion embulk-input-postgresql/src/test/java/org/embulk/input/postgresql/HstoreTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

public class HstoreTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/postgresql/test/expect/hstore/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/postgresql/test/expect/hstore/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
2 changes: 1 addition & 1 deletion embulk-input-postgresql/src/test/java/org/embulk/input/postgresql/IncrementalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

public class IncrementalTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/postgresql/test/expect/incremental/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/postgresql/test/expect/incremental/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
2 changes: 1 addition & 1 deletion embulk-input-postgresql/src/test/java/org/embulk/input/postgresql/UUIDTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

public class UUIDTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/postgresql/test/expect/uuid/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/postgresql/test/expect/uuid/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
8 changes: 4 additions & 4 deletions embulk-input-redshift/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ dependencies {
testImplementation project(":embulk-input-jdbc").sourceSets.test.output

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"
testImplementation "org.embulk:embulk-formatter-csv:0.11.1"
testImplementation "org.embulk:embulk-input-file:0.11.0"
testImplementation "org.embulk:embulk-output-file:0.11.0"
testImplementation "org.embulk:embulk-parser-csv:0.11.3"
}

embulkPlugin {
Expand Down
17 changes: 8 additions & 9 deletions embulk-input-redshift/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
# 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.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.embulk:embulk-spi:0.11=compileClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
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.postgresql:postgresql:9.4-1205-jdbc41=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:1.7.30=compileClasspath
org.slf4j:slf4j-api:2.0.7=compileClasspath
empty=
2 changes: 1 addition & 1 deletion embulk-input-redshift/src/test/java/org/embulk/input/redshift/IncrementalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

public class IncrementalTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/redshift/test/expect/incremental/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/redshift/test/expect/incremental/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
8 changes: 4 additions & 4 deletions embulk-input-sqlserver/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ dependencies {
implementation "org.apache.commons:commons-lang3:3.4"

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"
testImplementation "org.embulk:embulk-formatter-csv:0.11.1"
testImplementation "org.embulk:embulk-input-file:0.11.0"
testImplementation "org.embulk:embulk-output-file:0.11.0"
testImplementation "org.embulk:embulk-parser-csv:0.11.3"
}

embulkPlugin {
Expand Down
17 changes: 8 additions & 9 deletions embulk-input-sqlserver/gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# 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
com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,runtimeClasspath
com.google.code.gson:gson:2.8.0=compileClasspath,runtimeClasspath
Expand All @@ -19,13 +19,12 @@ 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.embulk:embulk-spi:0.11=compileClasspath
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
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.ow2.asm:asm:8.0.1=compileClasspath,runtimeClasspath
org.slf4j:slf4j-api:1.7.30=compileClasspath
org.slf4j:slf4j-api:2.0.7=compileClasspath
empty=
2 changes: 1 addition & 1 deletion embulk-input-sqlserver/src/test/java/org/embulk/input/sqlserver/BasicTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

public class BasicTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/sqlserver/test/expect/basic/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/sqlserver/test/expect/basic/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down
2 changes: 1 addition & 1 deletion embulk-input-sqlserver/src/test/java/org/embulk/input/sqlserver/IncrementalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

public class IncrementalTest
{
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/sqlserver/test/expect/incremental/";
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/sqlserver/test/expect/incremental/";

private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
{
Expand Down

0 comments on commit afe984e

Please sign in to comment.