Skip to content

Commit 69e4a04

Browse files
authored
Merge pull request #635 from ywy2090/release-1.2.1-remove-fastjson
deps upgrades
2 parents 621a921 + c7ef795 commit 69e4a04

File tree

4 files changed

+34
-24
lines changed

4 files changed

+34
-24
lines changed

Changelog.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
### V1.2.1 (2018-07-02)
1+
### V1.2.1.0 (2020-06-09)
2+
* 删除
3+
1. fastjson依赖
4+
* 更新
5+
1. netty-all升级至4.1.50.Final版本
6+
2. spring升级至4.3.27.RELEASE版本
7+
3. slf4j升级至1.7.30版本
8+
4. jackson-databind升级至2.11.0版本
9+
5. guava至升级29.0-jre版本
210

11+
### V1.2.1 (2018-07-02)
312
* Added
413

514
1. UTXO支持web3sdk调用

build.gradle

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ repositories {
2020

2121

2222
List logger = [
23-
"org.slf4j:jul-to-slf4j:1.7.10",
24-
"org.apache.logging.log4j:log4j-api:2.1",
25-
"org.apache.logging.log4j:log4j-core:2.1",
26-
"org.apache.logging.log4j:log4j-slf4j-impl:2.1",
27-
"org.apache.logging.log4j:log4j-web:2.1"
23+
'org.slf4j:slf4j-log4j12:1.7.30'
24+
// 'org.slf4j:slf4j-api:1.7.30'
2825
]
2926

30-
def spring_version="4.3.16.RELEASE"
27+
def spring_version="4.3.27.RELEASE"
3128
List spring =[
3229
"org.springframework:spring-core:$spring_version",
3330
"org.springframework:spring-beans:$spring_version",
@@ -45,16 +42,18 @@ List alibaba = [
4542
dependencies {
4643
compile logger,spring,alibaba
4744
runtime logger,spring,alibaba
48-
45+
4946
compile 'org.apache.commons:commons-lang3:3.1'
50-
compile "com.fasterxml.jackson.core:jackson-databind:2.9.6"
51-
runtime "com.fasterxml.jackson.core:jackson-databind:2.9.6"
52-
compile 'io.netty:netty-all:4.1.15.Final'
53-
runtime 'io.netty:netty-all:4.1.15.Final'
47+
runtime 'org.apache.commons:commons-lang3:3.1'
48+
compile "com.fasterxml.jackson.core:jackson-databind:2.11.0"
49+
runtime "com.fasterxml.jackson.core:jackson-databind:2.11.0"
50+
compile 'io.netty:netty-all:4.1.50.Final'
51+
runtime 'io.netty:netty-all:4.1.50.Final'
52+
5453
compile 'io.netty:netty-tcnative:2.0.0.Final'
5554
runtime 'io.netty:netty-tcnative:2.0.0.Final'
56-
compile 'com.google.guava:guava:19.0'
57-
runtime 'com.google.guava:guava:19.0'
55+
compile 'com.google.guava:guava:29.0-jre'
56+
runtime 'com.google.guava:guava:29.0-jre'
5857

5958
// web3j依赖
6059
compile 'org.apache.httpcomponents:httpclient:4.5.5',

publish.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ repositories {
3030
}
3131

3232
List logger = [
33-
// 'org.slf4j:slf4j-log4j12:1.7.25'
34-
'org.slf4j:slf4j-api:1.7.25'
33+
// 'org.slf4j:slf4j-log4j12:1.7.30'
34+
'org.slf4j:slf4j-api:1.7.30'
3535
]
3636

37-
def spring_version="4.3.16.RELEASE"
37+
def spring_version="4.3.27.RELEASE"
3838
List spring =[
3939
"org.springframework:spring-core:$spring_version",
4040
"org.springframework:spring-beans:$spring_version",
@@ -53,14 +53,16 @@ dependencies {
5353
compile logger,spring,alibaba
5454
runtime logger,spring,alibaba
5555

56-
compile "com.fasterxml.jackson.core:jackson-databind:2.9.6"
57-
runtime "com.fasterxml.jackson.core:jackson-databind:2.9.6"
58-
compile 'io.netty:netty-all:4.1.15.Final'
59-
runtime 'io.netty:netty-all:4.1.15.Final'
56+
compile 'org.apache.commons:commons-lang3:3.1'
57+
runtime 'org.apache.commons:commons-lang3:3.1'
58+
compile "com.fasterxml.jackson.core:jackson-databind:2.11.0"
59+
runtime "com.fasterxml.jackson.core:jackson-databind:2.11.0"
60+
compile 'io.netty:netty-all:4.1.50.Final'
61+
runtime 'io.netty:netty-all:4.1.50.Final'
6062
compile 'io.netty:netty-tcnative:2.0.0.Final'
6163
runtime 'io.netty:netty-tcnative:2.0.0.Final'
62-
compile 'com.google.guava:guava:19.0'
63-
runtime 'com.google.guava:guava:19.0'
64+
compile 'com.google.guava:guava:29.0-jre'
65+
runtime 'com.google.guava:guava:29.0-jre'
6466

6567
// web3j依赖
6668
compile 'org.apache.httpcomponents:httpclient:4.5.5',

release_note.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
V1.2.1
1+
V1.2.1.0

0 commit comments

Comments
 (0)