Skip to content

Commit a9c6b96

Browse files
civitaspocivitaspo
committed
Merge pull request #10 from sakama/upgrade-embulk-v0.8.6
Upgrade embulk v0.8.6
2 parents b447f02 + 0c18eab commit a9c6b96

File tree

8 files changed

+275
-28
lines changed

8 files changed

+275
-28
lines changed

‎build.gradle‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
id "com.github.kt3k.coveralls" version "2.4.0"
55
id "jacoco"
66
id "java"
7+
id "checkstyle"
78
}
89
import com.github.jrubygradle.JRubyExec
910
repositories {
@@ -19,14 +20,14 @@ sourceCompatibility = 1.7
1920
targetCompatibility = 1.7
2021

2122
dependencies {
22-
compile "org.embulk:embulk-core:0.7.+"
23-
provided "org.embulk:embulk-core:0.7.+"
23+
compile "org.embulk:embulk-core:0.8.6"
24+
provided "org.embulk:embulk-core:0.8.6"
2425
// compile "YOUR_JAR_DEPENDENCY_GROUP:YOUR_JAR_DEPENDENCY_MODULE:YOUR_JAR_DEPENDENCY_VERSION"
2526
compile "org.apache.commons:commons-vfs2:2.+"
2627
compile "com.jcraft:jsch:0.1.53"
2728
testCompile "junit:junit:4.+"
28-
testCompile "org.embulk:embulk-core:0.7.+:tests"
29-
testCompile "org.embulk:embulk-standards:0.7.+"
29+
testCompile "org.embulk:embulk-core:0.8.6:tests"
30+
testCompile "org.embulk:embulk-standards:0.8.6"
3031
testCompile "org.apache.sshd:apache-sshd:1.1.0+"
3132
}
3233

@@ -44,6 +45,23 @@ task classpath(type: Copy, dependsOn: ["jar"]) {
4445
}
4546
clean { delete "classpath" }
4647

48+
checkstyle {
49+
configFile = file("${project.rootDir}/config/checkstyle/checkstyle.xml")
50+
toolVersion = '6.14.1'
51+
}
52+
checkstyleMain {
53+
configFile = file("${project.rootDir}/config/checkstyle/default.xml")
54+
ignoreFailures = true
55+
}
56+
checkstyleTest {
57+
configFile = file("${project.rootDir}/config/checkstyle/default.xml")
58+
ignoreFailures = true
59+
}
60+
task checkstyle(type: Checkstyle) {
61+
classpath = sourceSets.main.output + sourceSets.test.output
62+
source = sourceSets.main.allJava + sourceSets.test.allJava
63+
}
64+
4765
task gem(type: JRubyExec, dependsOn: ["gemspec", "classpath"]) {
4866
jrubyArgs "-rrubygems/gem_runner", "-eGem::GemRunner.new.run(ARGV)", "build"
4967
script "${project.name}.gemspec"

‎config/checkstyle/checkstyle.xml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
5+
<module name="Checker">
6+
<!-- https://github.com/facebook/presto/blob/master/src/checkstyle/checks.xml -->
7+
<module name="FileTabCharacter"/>
8+
<module name="NewlineAtEndOfFile">
9+
<property name="lineSeparator" value="lf"/>
10+
</module>
11+
<module name="RegexpMultiline">
12+
<property name="format" value="\r"/>
13+
<property name="message" value="Line contains carriage return"/>
14+
</module>
15+
<module name="RegexpMultiline">
16+
<property name="format" value=" \n"/>
17+
<property name="message" value="Line has trailing whitespace"/>
18+
</module>
19+
<module name="RegexpMultiline">
20+
<property name="format" value="\{\n\n"/>
21+
<property name="message" value="Blank line after opening brace"/>
22+
</module>
23+
<module name="RegexpMultiline">
24+
<property name="format" value="\n\n\s*\}"/>
25+
<property name="message" value="Blank line before closing brace"/>
26+
</module>
27+
<module name="RegexpMultiline">
28+
<property name="format" value="\n\n\n"/>
29+
<property name="message" value="Multiple consecutive blank lines"/>
30+
</module>
31+
<module name="RegexpMultiline">
32+
<property name="format" value="\n\n\Z"/>
33+
<property name="message" value="Blank line before end of file"/>
34+
</module>
35+
<module name="RegexpMultiline">
36+
<property name="format" value="Preconditions\.checkNotNull"/>
37+
<property name="message" value="Use of checkNotNull"/>
38+
</module>
39+
40+
<module name="TreeWalker">
41+
<module name="EmptyBlock">
42+
<property name="option" value="text"/>
43+
<property name="tokens" value="
44+
LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF,
45+
LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT"/>
46+
</module>
47+
<module name="EmptyStatement"/>
48+
<module name="EmptyForInitializerPad"/>
49+
<module name="EmptyForIteratorPad">
50+
<property name="option" value="space"/>
51+
</module>
52+
<module name="MethodParamPad">
53+
<property name="allowLineBreaks" value="true"/>
54+
<property name="option" value="nospace"/>
55+
</module>
56+
<module name="ParenPad"/>
57+
<module name="TypecastParenPad"/>
58+
<module name="NeedBraces"/>
59+
<module name="LeftCurly">
60+
<property name="option" value="nl"/>
61+
<property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF"/>
62+
</module>
63+
<module name="LeftCurly">
64+
<property name="option" value="eol"/>
65+
<property name="tokens" value="
66+
LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
67+
LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/>
68+
</module>
69+
<module name="RightCurly">
70+
<property name="option" value="alone"/>
71+
</module>
72+
<module name="GenericWhitespace"/>
73+
<module name="WhitespaceAfter"/>
74+
<module name="NoWhitespaceBefore"/>
75+
76+
<module name="UpperEll"/>
77+
<module name="DefaultComesLast"/>
78+
<module name="ArrayTypeStyle"/>
79+
<module name="MultipleVariableDeclarations"/>
80+
<module name="ModifierOrder"/>
81+
<module name="OneStatementPerLine"/>
82+
<module name="StringLiteralEquality"/>
83+
<module name="MutableException"/>
84+
<module name="EqualsHashCode"/>
85+
<module name="InnerAssignment"/>
86+
<module name="InterfaceIsType"/>
87+
<module name="HideUtilityClassConstructor"/>
88+
89+
<module name="MemberName"/>
90+
<module name="LocalVariableName"/>
91+
<module name="LocalFinalVariableName"/>
92+
<module name="TypeName"/>
93+
<module name="PackageName"/>
94+
<module name="ParameterName"/>
95+
<module name="StaticVariableName"/>
96+
<module name="ClassTypeParameterName">
97+
<property name="format" value="^[A-Z][0-9]?$"/>
98+
</module>
99+
<module name="MethodTypeParameterName">
100+
<property name="format" value="^[A-Z][0-9]?$"/>
101+
</module>
102+
103+
<module name="AvoidStarImport"/>
104+
<module name="RedundantImport"/>
105+
<module name="UnusedImports"/>
106+
<module name="ImportOrder">
107+
<property name="groups" value="*,javax,java"/>
108+
<property name="separated" value="true"/>
109+
<property name="option" value="bottom"/>
110+
<property name="sortStaticImportsAlphabetically" value="true"/>
111+
</module>
112+
113+
<module name="WhitespaceAround">
114+
<property name="allowEmptyConstructors" value="true"/>
115+
<property name="allowEmptyMethods" value="true"/>
116+
<property name="ignoreEnhancedForColon" value="false"/>
117+
<property name="tokens" value="
118+
ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
119+
BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE,
120+
LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
121+
LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
122+
LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
123+
LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
124+
PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
125+
STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
126+
</module>
127+
</module>
128+
</module>

‎config/checkstyle/default.xml‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
5+
<!--
6+
This is a subset of ./checkstyle.xml which allows some loose styles
7+
-->
8+
<module name="Checker">
9+
<module name="FileTabCharacter"/>
10+
<module name="NewlineAtEndOfFile">
11+
<property name="lineSeparator" value="lf"/>
12+
</module>
13+
<module name="RegexpMultiline">
14+
<property name="format" value="\r"/>
15+
<property name="message" value="Line contains carriage return"/>
16+
</module>
17+
<module name="RegexpMultiline">
18+
<property name="format" value=" \n"/>
19+
<property name="message" value="Line has trailing whitespace"/>
20+
</module>
21+
<module name="RegexpMultiline">
22+
<property name="format" value="\n\n\n"/>
23+
<property name="message" value="Multiple consecutive blank lines"/>
24+
</module>
25+
<module name="RegexpMultiline">
26+
<property name="format" value="\n\n\Z"/>
27+
<property name="message" value="Blank line before end of file"/>
28+
</module>
29+
30+
<module name="TreeWalker">
31+
<module name="EmptyBlock">
32+
<property name="option" value="text"/>
33+
<property name="tokens" value="
34+
LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_IF,
35+
LITERAL_FOR, LITERAL_TRY, LITERAL_WHILE, INSTANCE_INIT, STATIC_INIT"/>
36+
</module>
37+
<module name="EmptyStatement"/>
38+
<module name="EmptyForInitializerPad"/>
39+
<module name="EmptyForIteratorPad">
40+
<property name="option" value="space"/>
41+
</module>
42+
<module name="MethodParamPad">
43+
<property name="allowLineBreaks" value="true"/>
44+
<property name="option" value="nospace"/>
45+
</module>
46+
<module name="ParenPad"/>
47+
<module name="TypecastParenPad"/>
48+
<module name="NeedBraces"/>
49+
<module name="LeftCurly">
50+
<property name="option" value="nl"/>
51+
<property name="tokens" value="CLASS_DEF, CTOR_DEF, INTERFACE_DEF, METHOD_DEF"/>
52+
</module>
53+
<module name="LeftCurly">
54+
<property name="option" value="eol"/>
55+
<property name="tokens" value="
56+
LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR,
57+
LITERAL_IF, LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE"/>
58+
</module>
59+
<module name="RightCurly">
60+
<property name="option" value="alone"/>
61+
</module>
62+
<module name="GenericWhitespace"/>
63+
<module name="WhitespaceAfter"/>
64+
<module name="NoWhitespaceBefore"/>
65+
66+
<module name="UpperEll"/>
67+
<module name="DefaultComesLast"/>
68+
<module name="ArrayTypeStyle"/>
69+
<module name="MultipleVariableDeclarations"/>
70+
<module name="ModifierOrder"/>
71+
<module name="OneStatementPerLine"/>
72+
<module name="StringLiteralEquality"/>
73+
<module name="MutableException"/>
74+
<module name="EqualsHashCode"/>
75+
<module name="InnerAssignment"/>
76+
<module name="InterfaceIsType"/>
77+
<module name="HideUtilityClassConstructor"/>
78+
79+
<module name="MemberName"/>
80+
<module name="LocalVariableName"/>
81+
<module name="LocalFinalVariableName"/>
82+
<module name="TypeName"/>
83+
<module name="PackageName"/>
84+
<module name="ParameterName"/>
85+
<module name="StaticVariableName"/>
86+
<module name="ClassTypeParameterName">
87+
<property name="format" value="^[A-Z][0-9]?$"/>
88+
</module>
89+
<module name="MethodTypeParameterName">
90+
<property name="format" value="^[A-Z][0-9]?$"/>
91+
</module>
92+
93+
<module name="WhitespaceAround">
94+
<property name="allowEmptyConstructors" value="true"/>
95+
<property name="allowEmptyMethods" value="true"/>
96+
<property name="ignoreEnhancedForColon" value="false"/>
97+
<property name="tokens" value="
98+
ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
99+
BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE,
100+
LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
101+
LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
102+
LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
103+
LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL,
104+
PLUS, PLUS_ASSIGN, QUESTION, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
105+
STAR, STAR_ASSIGN, TYPE_EXTENSION_AND"/>
106+
</module>
107+
</module>
108+
</module>

‎gradle/wrapper/gradle-wrapper.jar‎

2.56 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Aug 11 00:26:20 PDT 2015
1+
#Wed Jan 13 12:41:02 JST 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

‎src/main/java/org/embulk/output/sftp/SftpFileOutput.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ public TaskReport commit()
172172
return Exec.newTaskReport();
173173
}
174174

175-
176175
private void closeCurrentFile()
177176
{
178177
if (currentFile == null) {

‎src/main/java/org/embulk/output/sftp/SftpFileOutputPlugin.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public interface PluginTask
6868
@Config("sequence_format")
6969
@ConfigDefault("\"%03d.%02d.\"")
7070
public String getSequenceFormat();
71-
7271
}
7372

7473
@Override

0 commit comments

Comments
 (0)