Skip to content

Commit 963c160

Browse files
longbailongbai
committed
update version[ci skip]
1 parent 440607d commit 963c160

File tree

9 files changed

+150
-151
lines changed

9 files changed

+150
-151
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#Changelog
22

3+
## 7.0.10 (2016-09-02)
4+
### 增加
5+
* x:foo 方式增加自定义变量
6+
37
## 7.0.10 (2016-06-27)
48
### 修正
59
* 断点上传,skip 已上传部分

‎build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'java'
55
sourceCompatibility = 1.6
66
targetCompatibility = 1.6
77
version = '1.0'
8-
[compileJava,compileTestJava,javadoc]*.options*.encoding = 'UTF-8'
8+
[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
99

1010
repositories {
1111
mavenCentral()
@@ -18,9 +18,9 @@ dependencies {
1818
if (c < 0) {
1919
compile fileTree(dir: 'libs', include: '*.jar')
2020
} else {
21-
compile group:'com.squareup.okhttp', name:'okhttp', version:'2.7.1'
21+
compile group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.1'
2222
}
23-
compile group:'com.google.code.gson', name:'gson', version:'2.3.1'
23+
compile group: 'com.google.code.gson', name: 'gson', version: '2.3.1'
2424
testCompile group: 'junit', name: 'junit', version: '4.11'
2525
println("JDK : " + version)
2626
}
@@ -52,8 +52,8 @@ apply from: 'mvn_push.gradle'
5252

5353
apply plugin: 'eclipse'
5454

55-
task gen_eclipse(dependsOn:[
56-
'cleanEclipseProject', 'cleanEclipseClasspath',
57-
'eclipseProject', 'eclipseClasspath'])
55+
task gen_eclipse(dependsOn: [
56+
'cleanEclipseProject', 'cleanEclipseClasspath',
57+
'eclipseProject', 'eclipseClasspath'])
5858
eclipseProject.mustRunAfter cleanEclipseProject
5959
eclipseClasspath.mustRunAfter cleanEclipseClasspath

‎config/checkstyle/checkstyle.xml

Lines changed: 125 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,136 @@
11
<?xml version="1.0"?>
22
<!DOCTYPE module PUBLIC
3-
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4-
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
3+
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
55

66
<module name="Checker">
7-
<module name="NewlineAtEndOfFile"/>
8-
<module name="FileLength"/>
9-
<module name="FileTabCharacter"/>
10-
11-
<!-- Trailing spaces -->
12-
<module name="RegexpSingleline">
13-
<property name="format" value="\s+$"/>
14-
<property name="message" value="Line has trailing spaces."/>
15-
</module>
16-
17-
<!-- Space after 'for' and 'if' -->
18-
<module name="RegexpSingleline">
19-
<property name="format" value="^\s*(for|if)\b[^ ]"/>
20-
<property name="message" value="Space needed before opening parenthesis."/>
21-
</module>
22-
23-
<!-- For each spacing -->
24-
<module name="RegexpSingleline">
25-
<property name="format" value="^\s*for \(.*?([^ ]:|:[^ ])"/>
26-
<property name="message" value="Space needed around ':' character."/>
27-
</module>
28-
29-
<module name="SuppressionCommentFilter">
30-
</module>
31-
32-
<module name="TreeWalker">
33-
<module name="FileContentsHolder"/>
34-
<!-- Checks for Javadoc comments. -->
35-
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
36-
<!--module name="JavadocMethod"/-->
37-
<!--module name="JavadocType"/-->
38-
<!--module name="JavadocVariable"/-->
39-
<module name="JavadocStyle">
40-
<property name="checkFirstSentence" value="false"/>
7+
<module name="NewlineAtEndOfFile"/>
8+
<module name="FileLength"/>
9+
<module name="FileTabCharacter"/>
10+
11+
<!-- Trailing spaces -->
12+
<module name="RegexpSingleline">
13+
<property name="format" value="\s+$"/>
14+
<property name="message" value="Line has trailing spaces."/>
4115
</module>
4216

17+
<!-- Space after 'for' and 'if' -->
18+
<module name="RegexpSingleline">
19+
<property name="format" value="^\s*(for|if)\b[^ ]"/>
20+
<property name="message" value="Space needed before opening parenthesis."/>
21+
</module>
22+
23+
<!-- For each spacing -->
24+
<module name="RegexpSingleline">
25+
<property name="format" value="^\s*for \(.*?([^ ]:|:[^ ])"/>
26+
<property name="message" value="Space needed around ':' character."/>
27+
</module>
4328

44-
<!-- Checks for Naming Conventions. -->
45-
<!-- See http://checkstyle.sf.net/config_naming.html -->
46-
<!--<module name="ConstantName"/>
47-
<module name="LocalFinalVariableName"/>
48-
<module name="LocalVariableName"/>-->
49-
<module name="MemberName"/>
50-
<module name="MethodName"/>
51-
<module name="PackageName"/>
52-
<!--<module name="ParameterName"/>-->
53-
<module name="StaticVariableName"/>
54-
<module name="TypeName"/>
55-
56-
57-
<!-- Checks for imports -->
58-
<!-- See http://checkstyle.sf.net/config_import.html -->
59-
<!--<module name="AvoidStarImport"/> -->
60-
<module name="IllegalImport"/>
61-
<!-- defaults to sun.* packages -->
62-
<module name="RedundantImport"/>
63-
<module name="UnusedImports">
64-
<property name="processJavadoc" value="true"/>
29+
<module name="SuppressionCommentFilter">
6530
</module>
6631

67-
<!-- Checks for Size Violations. -->
68-
<!-- See http://checkstyle.sf.net/config_sizes.html -->
69-
<module name="LineLength">
70-
<property name="max" value="120"/>
32+
<module name="TreeWalker">
33+
<module name="FileContentsHolder"/>
34+
<!-- Checks for Javadoc comments. -->
35+
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
36+
<!--module name="JavadocMethod"/-->
37+
<!--module name="JavadocType"/-->
38+
<!--module name="JavadocVariable"/-->
39+
<module name="JavadocStyle">
40+
<property name="checkFirstSentence" value="false"/>
41+
</module>
42+
43+
44+
<!-- Checks for Naming Conventions. -->
45+
<!-- See http://checkstyle.sf.net/config_naming.html -->
46+
<!--<module name="ConstantName"/>
47+
<module name="LocalFinalVariableName"/>
48+
<module name="LocalVariableName"/>-->
49+
<module name="MemberName"/>
50+
<module name="MethodName"/>
51+
<module name="PackageName"/>
52+
<!--<module name="ParameterName"/>-->
53+
<module name="StaticVariableName"/>
54+
<module name="TypeName"/>
55+
56+
57+
<!-- Checks for imports -->
58+
<!-- See http://checkstyle.sf.net/config_import.html -->
59+
<!--<module name="AvoidStarImport"/> -->
60+
<module name="IllegalImport"/>
61+
<!-- defaults to sun.* packages -->
62+
<module name="RedundantImport"/>
63+
<module name="UnusedImports">
64+
<property name="processJavadoc" value="true"/>
65+
</module>
66+
67+
<!-- Checks for Size Violations. -->
68+
<!-- See http://checkstyle.sf.net/config_sizes.html -->
69+
<module name="LineLength">
70+
<property name="max" value="120"/>
71+
</module>
72+
<module name="MethodLength"/>
73+
74+
75+
<!-- Checks for whitespace -->
76+
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
77+
<module name="GenericWhitespace"/>
78+
<!--<module name="EmptyForIteratorPad"/>-->
79+
<module name="MethodParamPad"/>
80+
<!--<module name="NoWhitespaceAfter"/>-->
81+
<!--<module name="NoWhitespaceBefore"/>-->
82+
<module name="OperatorWrap"/>
83+
<module name="ParenPad"/>
84+
<module name="TypecastParenPad"/>
85+
<module name="WhitespaceAfter"/>
86+
<module name="WhitespaceAround"/>
87+
88+
89+
<!-- Modifier Checks -->
90+
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
91+
<module name="ModifierOrder"/>
92+
<module name="RedundantModifier"/>
93+
94+
95+
<!-- Checks for blocks. You know, those {}'s -->
96+
<!-- See http://checkstyle.sf.net/config_blocks.html -->
97+
<module name="AvoidNestedBlocks"/>
98+
<!--module name="EmptyBlock"/-->
99+
<module name="LeftCurly"/>
100+
<!--<module name="NeedBraces"/>-->
101+
<module name="RightCurly"/>
102+
103+
104+
<!-- Checks for common coding problems -->
105+
<!-- See http://checkstyle.sf.net/config_coding.html -->
106+
<!--module name="AvoidInlineConditionals"/-->
107+
<module name="CovariantEquals"/>
108+
<module name="EmptyStatement"/>
109+
<!--<module name="EqualsAvoidNull"/>-->
110+
<module name="EqualsHashCode"/>
111+
<!--module name="HiddenField"/-->
112+
<module name="IllegalInstantiation"/>
113+
<!--module name="InnerAssignment"/-->
114+
<!--module name="MagicNumber"/-->
115+
<!--module name="MissingSwitchDefault"/-->
116+
<module name="RedundantThrows"/>
117+
<module name="SimplifyBooleanExpression"/>
118+
<module name="SimplifyBooleanReturn"/>
119+
120+
<!-- Checks for class design -->
121+
<!-- See http://checkstyle.sf.net/config_design.html -->
122+
<!--module name="DesignForExtension"/-->
123+
<!--<module name="FinalClass"/>-->
124+
<module name="HideUtilityClassConstructor"/>
125+
<module name="InterfaceIsType"/>
126+
<!--module name="VisibilityModifier"/-->
127+
128+
129+
<!-- Miscellaneous other checks. -->
130+
<!-- See http://checkstyle.sf.net/config_misc.html -->
131+
<module name="ArrayTypeStyle"/>
132+
<!--module name="FinalParameters"/-->
133+
<!--module name="TodoComment"/-->
134+
<module name="UpperEll"/>
71135
</module>
72-
<module name="MethodLength"/>
73-
74-
75-
<!-- Checks for whitespace -->
76-
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
77-
<module name="GenericWhitespace"/>
78-
<!--<module name="EmptyForIteratorPad"/>-->
79-
<module name="MethodParamPad"/>
80-
<!--<module name="NoWhitespaceAfter"/>-->
81-
<!--<module name="NoWhitespaceBefore"/>-->
82-
<module name="OperatorWrap"/>
83-
<module name="ParenPad"/>
84-
<module name="TypecastParenPad"/>
85-
<module name="WhitespaceAfter"/>
86-
<module name="WhitespaceAround"/>
87-
88-
89-
<!-- Modifier Checks -->
90-
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
91-
<module name="ModifierOrder"/>
92-
<module name="RedundantModifier"/>
93-
94-
95-
<!-- Checks for blocks. You know, those {}'s -->
96-
<!-- See http://checkstyle.sf.net/config_blocks.html -->
97-
<module name="AvoidNestedBlocks"/>
98-
<!--module name="EmptyBlock"/-->
99-
<module name="LeftCurly"/>
100-
<!--<module name="NeedBraces"/>-->
101-
<module name="RightCurly"/>
102-
103-
104-
<!-- Checks for common coding problems -->
105-
<!-- See http://checkstyle.sf.net/config_coding.html -->
106-
<!--module name="AvoidInlineConditionals"/-->
107-
<module name="CovariantEquals"/>
108-
<module name="EmptyStatement"/>
109-
<!--<module name="EqualsAvoidNull"/>-->
110-
<module name="EqualsHashCode"/>
111-
<!--module name="HiddenField"/-->
112-
<module name="IllegalInstantiation"/>
113-
<!--module name="InnerAssignment"/-->
114-
<!--module name="MagicNumber"/-->
115-
<!--module name="MissingSwitchDefault"/-->
116-
<module name="RedundantThrows"/>
117-
<module name="SimplifyBooleanExpression"/>
118-
<module name="SimplifyBooleanReturn"/>
119-
120-
<!-- Checks for class design -->
121-
<!-- See http://checkstyle.sf.net/config_design.html -->
122-
<!--module name="DesignForExtension"/-->
123-
<!--<module name="FinalClass"/>-->
124-
<module name="HideUtilityClassConstructor"/>
125-
<module name="InterfaceIsType"/>
126-
<!--module name="VisibilityModifier"/-->
127-
128-
129-
<!-- Miscellaneous other checks. -->
130-
<!-- See http://checkstyle.sf.net/config_misc.html -->
131-
<module name="ArrayTypeStyle"/>
132-
<!--module name="FinalParameters"/-->
133-
<!--module name="TodoComment"/-->
134-
<module name="UpperEll"/>
135-
</module>
136136
</module>

‎gradle.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
VERSION_NAME=
22
VERSION_CODE=
3-
43
GROUP=com.qiniu
5-
64
POM_DESCRIPTION=Qiniu Cloud Storage SDK for Java
75
POM_URL=https://github.com/qiniu/java-sdk
86
POM_SCM_URL=https://github.com/qiniu/java-sdk
@@ -11,10 +9,8 @@ POM_SCM_DEV_CONNECTION=scm:[email protected]:qiniu/java-sdk.git
119
POM_LICENCE_NAME=MIT License
1210
POM_LICENCE_URL=http://opensource.org/licenses/MIT
1311
POM_LICENCE_DIST=repo
14-
1512
POM_DEVELOPER_ID=qiniu
1613
POM_DEVELOPER_NAME=Qiniu
17-
1814
POM_ARTIFACT_ID=qiniu-java-sdk
1915
POM_NAME=qiniu-java-sdk
2016
POM_PACKAGING=jar

‎mvn_push.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ afterEvaluate { project ->
102102
from javadocs.destinationDir
103103
}
104104

105-
task sourcesJar(type: Jar, dependsOn:classes) {
105+
task sourcesJar(type: Jar, dependsOn: classes) {
106106
classifier = 'sources'
107107
from sourceSets.main.allSource
108108
}

‎src/main/java/com/qiniu/common/Config.java

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

77
public final class Config {
88

9-
public static final String VERSION = "7.0.10";
9+
public static final String VERSION = "7.0.11";
1010
/**
1111
* 断点上传时的分块大小(默认的分块大小, 不允许改变)
1212
*/

‎src/test/java/com/qiniu/TempFile.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
* Created by bailong on 14/10/11.
1010
*/
1111
public final class TempFile {
12+
static final Random r = new Random();
13+
1214
private TempFile() {
1315
}
1416

15-
static final Random r = new Random();
16-
1717
public static void remove(File f) {
1818
f.delete();
1919
}

‎src/test/java/com/qiniu/storage/FormUploadTest.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,6 @@ public void testSizeMin2() {
271271
}
272272
}
273273

274-
class MyRet {
275-
public String hash;
276-
public String key;
277-
public String fsize;
278-
public String fname;
279-
public String mimeType;
280-
}
281-
282274
// @Test
283275
public void testFormLargeSize() {
284276
Config.PUT_THRESHOLD = 25 * 1024 * 1024;
@@ -304,7 +296,6 @@ public void testFormLargeSize() {
304296

305297
}
306298

307-
308299
// @Test
309300
public void testFormLargeSize2() {
310301
Config.PUT_THRESHOLD = 25 * 1024 * 1024;
@@ -335,4 +326,12 @@ public void testFormLargeSize2() {
335326

336327
}
337328

329+
class MyRet {
330+
public String hash;
331+
public String key;
332+
public String fsize;
333+
public String fname;
334+
public String mimeType;
335+
}
336+
338337
}

0 commit comments

Comments
 (0)