Skip to content

Commit e528d1a

Browse files
authored
Merge pull request #256 from embulk/upgrade-spi-0.11-config-0.3.4-json-0.3.0-timestamp-0.2.2
Upgrade the SPI to 0.11, embulk-util-config to 0.3.4, embulk-util-json to 0.3.0, and embulk-util-timestamp to 0.2.2
2 parents fe47bd3 + afe984e commit e528d1a

File tree

20 files changed

+74
-80
lines changed

20 files changed

+74
-80
lines changed

build.gradle

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ subprojects {
4444
}
4545

4646
dependencies {
47-
compileOnly "org.embulk:embulk-api:0.10.36"
48-
compileOnly "org.embulk:embulk-spi:0.10.36"
47+
compileOnly "org.embulk:embulk-spi:0.11"
4948

50-
implementation("org.embulk:embulk-util-config:0.3.2") {
49+
implementation("org.embulk:embulk-util-config:0.3.4") {
5150
// They conflict with embulk-core. They are once excluded here,
5251
// and added explicitly with versions exactly the same with older embulk-core (until v0.10.31).
5352
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
@@ -61,16 +60,16 @@ subprojects {
6160
// and added explicitly with versions exactly the same with older embulk-core (until 0.10.31).
6261
implementation "com.fasterxml.jackson.core:jackson-annotations:2.6.7"
6362
implementation "com.fasterxml.jackson.core:jackson-core:2.6.7"
64-
implementation "com.fasterxml.jackson.core:jackson-databind:2.6.7"
63+
implementation "com.fasterxml.jackson.core:jackson-databind:2.6.7.5"
6564
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7"
6665
implementation "javax.validation:validation-api:1.1.0.Final"
6766

68-
implementation "org.embulk:embulk-util-json:0.1.1"
69-
implementation "org.embulk:embulk-util-timestamp:0.2.1"
67+
implementation "org.embulk:embulk-util-json:0.3.0"
68+
implementation "org.embulk:embulk-util-timestamp:0.2.2"
7069

71-
testImplementation "org.embulk:embulk-junit4:0.10.36"
72-
testImplementation "org.embulk:embulk-core:0.10.36"
73-
testImplementation "org.embulk:embulk-deps:0.10.36"
70+
testImplementation "org.embulk:embulk-junit4:0.11.1"
71+
testImplementation "org.embulk:embulk-core:0.11.1"
72+
testImplementation "org.embulk:embulk-deps:0.11.1"
7473
}
7574

7675
javadoc {

embulk-input-jdbc/gradle.lockfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
# This file is expected to be part of source control.
44
com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath
55
com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath
77
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
88
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
9-
org.embulk:embulk-api:0.10.36=compileClasspath
10-
org.embulk:embulk-spi:0.10.36=compileClasspath
11-
org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath
12-
org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath
13-
org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath
14-
org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath
15-
org.msgpack:msgpack-core:0.8.11=compileClasspath
16-
org.slf4j:slf4j-api:1.7.30=compileClasspath
9+
org.embulk:embulk-spi:0.11=compileClasspath
10+
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
11+
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
12+
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
13+
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
14+
org.msgpack:msgpack-core:0.8.24=compileClasspath
15+
org.slf4j:slf4j-api:2.0.7=compileClasspath
1716
empty=

embulk-input-mysql/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ dependencies {
55
defaultJdbcDriver 'mysql:mysql-connector-java:5.1.44'
66

77
testImplementation "com.google.guava:guava:18.0"
8-
testImplementation "org.embulk:embulk-formatter-csv:0.10.36"
9-
testImplementation "org.embulk:embulk-input-file:0.10.36"
10-
testImplementation "org.embulk:embulk-output-file:0.10.36"
11-
testImplementation "org.embulk:embulk-parser-csv:0.10.36"
8+
testImplementation "org.embulk:embulk-formatter-csv:0.11.1"
9+
testImplementation "org.embulk:embulk-input-file:0.11.0"
10+
testImplementation "org.embulk:embulk-output-file:0.11.0"
11+
testImplementation "org.embulk:embulk-parser-csv:0.11.3"
1212

1313
testImplementation "mysql:mysql-connector-java:5.1.44"
1414
}

embulk-input-mysql/gradle.lockfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
# This file is expected to be part of source control.
44
com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath
55
com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath
77
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
88
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
99
mysql:mysql-connector-java:5.1.44=compileClasspath
10-
org.embulk:embulk-api:0.10.36=compileClasspath
11-
org.embulk:embulk-spi:0.10.36=compileClasspath
12-
org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath
13-
org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath
14-
org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath
15-
org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath
16-
org.msgpack:msgpack-core:0.8.11=compileClasspath
17-
org.slf4j:slf4j-api:1.7.30=compileClasspath
10+
org.embulk:embulk-spi:0.11=compileClasspath
11+
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
12+
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
13+
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
14+
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
15+
org.msgpack:msgpack-core:0.8.24=compileClasspath
16+
org.slf4j:slf4j-api:2.0.7=compileClasspath
1817
empty=

embulk-input-mysql/src/test/java/org/embulk/input/mysql/BasicTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
public class BasicTest
3131
{
32-
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/mysql/test/expect/basic/";
32+
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/mysql/test/expect/basic/";
3333

3434
private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
3535
{

embulk-input-mysql/src/test/java/org/embulk/input/mysql/IncrementalTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
public class IncrementalTest
2929
{
30-
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/mysql/test/expect/incremental/";
30+
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/mysql/test/expect/incremental/";
3131

3232
private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
3333
{

embulk-input-mysql/src/test/java/org/embulk/input/mysql/OptionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
public class OptionTest
2828
{
29-
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/mysql/test/expect/option/";
29+
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/mysql/test/expect/option/";
3030

3131
private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
3232
{

embulk-input-postgresql/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ dependencies {
55
defaultJdbcDriver 'org.postgresql:postgresql:9.4-1205-jdbc41'
66

77
testImplementation "com.google.guava:guava:18.0"
8-
testImplementation "org.embulk:embulk-formatter-csv:0.10.36"
9-
testImplementation "org.embulk:embulk-input-file:0.10.36"
10-
testImplementation "org.embulk:embulk-output-file:0.10.36"
11-
testImplementation "org.embulk:embulk-parser-csv:0.10.36"
8+
testImplementation "org.embulk:embulk-formatter-csv:0.11.1"
9+
testImplementation "org.embulk:embulk-input-file:0.11.0"
10+
testImplementation "org.embulk:embulk-output-file:0.11.0"
11+
testImplementation "org.embulk:embulk-parser-csv:0.11.3"
1212

1313
testImplementation "org.postgresql:postgresql:9.4-1205-jdbc41"
1414
}

embulk-input-postgresql/gradle.lockfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
# This file is expected to be part of source control.
44
com.fasterxml.jackson.core:jackson-annotations:2.6.7=compileClasspath,runtimeClasspath
55
com.fasterxml.jackson.core:jackson-core:2.6.7=compileClasspath,runtimeClasspath
6-
com.fasterxml.jackson.core:jackson-databind:2.6.7=compileClasspath,runtimeClasspath
6+
com.fasterxml.jackson.core:jackson-databind:2.6.7.5=compileClasspath,runtimeClasspath
77
com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.6.7=compileClasspath,runtimeClasspath
88
javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath
9-
org.embulk:embulk-api:0.10.36=compileClasspath
10-
org.embulk:embulk-spi:0.10.36=compileClasspath
11-
org.embulk:embulk-util-config:0.3.2=compileClasspath,runtimeClasspath
12-
org.embulk:embulk-util-json:0.1.1=compileClasspath,runtimeClasspath
13-
org.embulk:embulk-util-rubytime:0.3.2=runtimeClasspath
14-
org.embulk:embulk-util-timestamp:0.2.1=compileClasspath,runtimeClasspath
15-
org.msgpack:msgpack-core:0.8.11=compileClasspath
9+
org.embulk:embulk-spi:0.11=compileClasspath
10+
org.embulk:embulk-util-config:0.3.4=compileClasspath,runtimeClasspath
11+
org.embulk:embulk-util-json:0.3.0=compileClasspath,runtimeClasspath
12+
org.embulk:embulk-util-rubytime:0.3.3=compileClasspath,runtimeClasspath
13+
org.embulk:embulk-util-timestamp:0.2.2=compileClasspath,runtimeClasspath
14+
org.msgpack:msgpack-core:0.8.24=compileClasspath
1615
org.postgresql:postgresql:9.4-1205-jdbc41=compileClasspath
17-
org.slf4j:slf4j-api:1.7.30=compileClasspath
16+
org.slf4j:slf4j-api:2.0.7=compileClasspath
1817
empty=

embulk-input-postgresql/src/test/java/org/embulk/input/postgresql/ArrayTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
public class ArrayTest
2727
{
28-
private static final String BASIC_RESOURCE_PATH = "org/embulk/input/postgresql/test/expect/array/";
28+
private static final String BASIC_RESOURCE_PATH = "/org/embulk/input/postgresql/test/expect/array/";
2929

3030
private static ConfigSource loadYamlResource(TestingEmbulk embulk, String fileName)
3131
{

0 commit comments

Comments
 (0)