Skip to content

Commit 48cc2bd

Browse files
dmikurubedmikurube
authored
Merge pull request #110 from embulk/upgrade-util-config-0.2.0-util-retryhelper-0.8.1
Upgrade Gradle, dependency libraries, and bump itself up to v0.5.1-SNAPSHOT
2 parents 1977f5d + 89a1831 commit 48cc2bd

File tree

9 files changed

+37
-49
lines changed

9 files changed

+37
-49
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
}
99

1010
group = "org.embulk"
11-
version = "0.5.0-SNAPSHOT"
11+
version = "0.5.1-SNAPSHOT"
1212

1313
subprojects {
1414
apply plugin: "java"

‎embulk-input-riak_cs/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ repositories {
88
}
99

1010
dependencies {
11-
compileOnly "org.embulk:embulk-api:0.10.18"
12-
compileOnly "org.embulk:embulk-spi:0.10.18"
11+
compileOnly "org.embulk:embulk-api:0.10.19"
12+
compileOnly "org.embulk:embulk-spi:0.10.19"
1313
// No longer need to depend on "embulk-core"!
1414

1515
compile(project(":embulk-input-s3")) {
1616
// They conflict with embulk-core. They are once excluded here,
17-
// and added explicitly with versions exactly the same with embulk-core:0.10.18.
17+
// and added explicitly with versions exactly the same with embulk-core:0.10.19.
1818
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
1919
exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
2020
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
@@ -24,7 +24,7 @@ dependencies {
2424
}
2525

2626
// They are once excluded from transitive dependencies of other dependencies,
27-
// and added explicitly with versions exactly the same with embulk-core:0.10.18.
27+
// and added explicitly with versions exactly the same with embulk-core:0.10.19.
2828
compile "com.fasterxml.jackson.core:jackson-annotations:2.6.7"
2929
compile "com.fasterxml.jackson.core:jackson-core:2.6.7"
3030
compile "com.fasterxml.jackson.core:jackson-databind:2.6.7"
@@ -34,12 +34,12 @@ dependencies {
3434

3535
testCompile "junit:junit:4.13"
3636
testCompile "org.mockito:mockito-core:1.10.19"
37-
testCompile "org.embulk:embulk-api:0.10.18"
38-
testCompile "org.embulk:embulk-spi:0.10.18"
39-
testCompile "org.embulk:embulk-core:0.10.18"
40-
testCompile "org.embulk:embulk-core:0.10.18:tests"
41-
testCompile "org.embulk:embulk-deps:0.10.18"
42-
testCompile "org.embulk:embulk-standards:0.10.18"
37+
testCompile "org.embulk:embulk-api:0.10.19"
38+
testCompile "org.embulk:embulk-spi:0.10.19"
39+
testCompile "org.embulk:embulk-core:0.10.19"
40+
testCompile "org.embulk:embulk-core:0.10.19:tests"
41+
testCompile "org.embulk:embulk-deps:0.10.19"
42+
testCompile "org.embulk:embulk-standards:0.10.19"
4343
testCompile project(":embulk-input-s3").sourceSets.test.output
4444
}
4545

‎embulk-input-riak_cs/gradle/dependency-locks/embulkPluginRuntime.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ joda-time:joda-time:2.9.2
1717
org.apache.httpcomponents:httpclient:4.5.5
1818
org.apache.httpcomponents:httpcore:4.4.9
1919
org.embulk:embulk-util-aws-credentials:0.4.0
20-
org.embulk:embulk-util-config:0.1.3
20+
org.embulk:embulk-util-config:0.2.0
2121
org.embulk:embulk-util-file:0.1.1
22-
org.embulk:embulk-util-retryhelper:0.8.0
22+
org.embulk:embulk-util-retryhelper:0.8.1
2323
org.slf4j:jcl-over-slf4j:1.7.12
2424
software.amazon.ion:ion-java:1.0.2

‎embulk-input-s3/build.gradle‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ repositories {
88
}
99

1010
dependencies {
11-
compileOnly "org.embulk:embulk-api:0.10.18"
12-
compileOnly "org.embulk:embulk-spi:0.10.18"
11+
compileOnly "org.embulk:embulk-api:0.10.19"
12+
compileOnly "org.embulk:embulk-spi:0.10.19"
1313

1414
compile("com.amazonaws:aws-java-sdk-s3:1.11.466") {
1515
// They conflict with embulk-core. They are once excluded here,
16-
// and added explicitly with versions exactly the same with embulk-core:0.10.18.
16+
// and added explicitly with versions exactly the same with embulk-core:0.10.19.
1717
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
1818
exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
1919
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
@@ -25,7 +25,7 @@ dependencies {
2525

2626
compile("com.amazonaws:aws-java-sdk-sts:1.11.466") {
2727
// They conflict with embulk-core. They are once excluded here,
28-
// and added explicitly with versions exactly the same with embulk-core:0.10.18.
28+
// and added explicitly with versions exactly the same with embulk-core:0.10.19.
2929
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
3030
exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
3131
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
@@ -43,13 +43,13 @@ dependencies {
4343
exclude group: "org.slf4j", module: "slf4j-api"
4444
}
4545

46-
compile "org.embulk:embulk-util-retryhelper:0.8.0"
46+
compile "org.embulk:embulk-util-retryhelper:0.8.1"
4747

4848
compile "org.embulk:embulk-util-file:0.1.1"
4949

5050
compile("org.embulk:embulk-util-aws-credentials:0.4.0") {
5151
// They conflict with embulk-core. They are once excluded here,
52-
// and added explicitly with versions exactly the same with embulk-core:0.10.18.
52+
// and added explicitly with versions exactly the same with embulk-core:0.10.19.
5353
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
5454
exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
5555
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
@@ -58,9 +58,9 @@ dependencies {
5858
exclude group: "joda-time", module: "joda-time"
5959
}
6060

61-
compile("org.embulk:embulk-util-config:0.1.3") {
61+
compile("org.embulk:embulk-util-config:0.2.0") {
6262
// They conflict with embulk-core. They are once excluded here,
63-
// and added explicitly with versions exactly the same with embulk-core:0.10.18.
63+
// and added explicitly with versions exactly the same with embulk-core:0.10.19.
6464
exclude group: "com.fasterxml.jackson.core", module: "jackson-annotations"
6565
exclude group: "com.fasterxml.jackson.core", module: "jackson-core"
6666
exclude group: "com.fasterxml.jackson.core", module: "jackson-databind"
@@ -69,7 +69,7 @@ dependencies {
6969
}
7070

7171
// They are once excluded from transitive dependencies of other dependencies,
72-
// and added explicitly with versions exactly the same with embulk-core:0.10.18.
72+
// and added explicitly with versions exactly the same with embulk-core:0.10.19.
7373
compile "com.fasterxml.jackson.core:jackson-annotations:2.6.7"
7474
compile "com.fasterxml.jackson.core:jackson-core:2.6.7"
7575
compile "com.fasterxml.jackson.core:jackson-databind:2.6.7"
@@ -79,12 +79,12 @@ dependencies {
7979

8080
testCompile "junit:junit:4.13"
8181
testCompile "org.mockito:mockito-core:1.10.19"
82-
testCompile "org.embulk:embulk-api:0.10.18"
83-
testCompile "org.embulk:embulk-spi:0.10.18"
84-
testCompile "org.embulk:embulk-core:0.10.18"
85-
testCompile "org.embulk:embulk-core:0.10.18:tests"
86-
testCompile "org.embulk:embulk-deps:0.10.18"
87-
testCompile "org.embulk:embulk-standards:0.10.18"
82+
testCompile "org.embulk:embulk-api:0.10.19"
83+
testCompile "org.embulk:embulk-spi:0.10.19"
84+
testCompile "org.embulk:embulk-core:0.10.19"
85+
testCompile "org.embulk:embulk-core:0.10.19:tests"
86+
testCompile "org.embulk:embulk-deps:0.10.19"
87+
testCompile "org.embulk:embulk-standards:0.10.19"
8888
}
8989

9090
embulkPlugin {

‎embulk-input-s3/gradle/dependency-locks/embulkPluginRuntime.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ joda-time:joda-time:2.9.2
1717
org.apache.httpcomponents:httpclient:4.5.5
1818
org.apache.httpcomponents:httpcore:4.4.9
1919
org.embulk:embulk-util-aws-credentials:0.4.0
20-
org.embulk:embulk-util-config:0.1.3
20+
org.embulk:embulk-util-config:0.2.0
2121
org.embulk:embulk-util-file:0.1.1
22-
org.embulk:embulk-util-retryhelper:0.8.0
22+
org.embulk:embulk-util-retryhelper:0.8.1
2323
org.slf4j:jcl-over-slf4j:1.7.12
2424
software.amazon.ion:ion-java:1.0.2

‎gradle/wrapper/gradle-wrapper.jar‎

508 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

8383
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
8484

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath

‎gradlew.bat‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4040

4141
set JAVA_EXE=java.exe
4242
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto init
43+
if "%ERRORLEVEL%" == "0" goto execute
4444

4545
echo.
4646
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
5454
set JAVA_HOME=%JAVA_HOME:"=%
5555
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5656

57-
if exist "%JAVA_EXE%" goto init
57+
if exist "%JAVA_EXE%" goto execute
5858

5959
echo.
6060
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,28 +64,14 @@ echo location of your Java installation.
6464

6565
goto fail
6666

67-
:init
68-
@rem Get command-line arguments, handling Windows variants
69-
70-
if not "%OS%" == "Windows_NT" goto win9xME_args
71-
72-
:win9xME_args
73-
@rem Slurp the command line arguments.
74-
set CMD_LINE_ARGS=
75-
set _SKIP=2
76-
77-
:win9xME_args_slurp
78-
if "x%~1" == "x" goto execute
79-
80-
set CMD_LINE_ARGS=%*
81-
8267
:execute
8368
@rem Setup the command line
8469

8570
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
8671

72+
8773
@rem Execute Gradle
88-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
74+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
8975

9076
:end
9177
@rem End local scope for the variables with windows NT shell

0 commit comments

Comments
 (0)