Skip to content

Commit

Permalink
Merge pull request #644 from ywy2090/release-1.2.4.0
Browse files Browse the repository at this point in the history
deps upgrades
  • Loading branch information
ywy2090 authored Jun 15, 2020
2 parents 3b794eb + 19511f7 commit e528bff
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 13 deletions.
11 changes: 10 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
### V1.2.4.0 (2020-06-09)
* 删除
1. fastjson依赖
* 更新
1. netty-all升级至4.1.50.Final版本
2. spring升级至4.3.27.RELEASE版本
3. slf4j升级至1.7.30版本
4. jackson-databind升级至2.11.0版本
5. guava至升级29.0-jre版本

### V1.2.4 (2018-10-17)
* Updates

Expand All @@ -9,7 +19,6 @@
6. 修改compile.sh脚本,增加 .gradlew脚本。可以直接执行./gradlew build。
```
删除Async 中的@Component注解
```

### V1.2.3 (2018-10-10)
Expand Down
19 changes: 14 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ repositories {


List logger = [
'org.slf4j:slf4j-log4j12:1.7.25'
'org.slf4j:slf4j-log4j12:1.7.30'
// 'org.slf4j:slf4j-api:1.7.30'
]

def spring_version="4.3.18.RELEASE"
def spring_version="4.3.27.RELEASE"
List spring =[
"org.springframework:spring-core:$spring_version",
"org.springframework:spring-beans:$spring_version",
Expand All @@ -40,11 +41,19 @@ List alibaba = [
// In this section you declare the dependencies for your production and test code
dependencies {
compile logger,spring,alibaba
runtime logger,spring,alibaba

compile 'org.apache.commons:commons-lang3:3.1'
compile "com.fasterxml.jackson.core:jackson-databind:2.9.6"
compile 'io.netty:netty-all:4.1.15.Final'
runtime 'org.apache.commons:commons-lang3:3.1'
compile "com.fasterxml.jackson.core:jackson-databind:2.11.0"
runtime "com.fasterxml.jackson.core:jackson-databind:2.11.0"
compile 'io.netty:netty-all:4.1.50.Final'
runtime 'io.netty:netty-all:4.1.50.Final'

compile 'io.netty:netty-tcnative:2.0.18.Final'
compile 'com.google.guava:guava:19.0'
runtime 'io.netty:netty-tcnative:2.0.18.Final'
compile 'com.google.guava:guava:29.0-jre'
runtime 'com.google.guava:guava:29.0-jre'

// web3j依赖
compile 'org.apache.httpcomponents:httpclient:4.5.5',
Expand Down
19 changes: 13 additions & 6 deletions publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ repositories {
}

List logger = [
// 'org.slf4j:slf4j-log4j12:1.7.25'
'org.slf4j:slf4j-api:1.7.25'
// 'org.slf4j:slf4j-log4j12:1.7.30'
'org.slf4j:slf4j-api:1.7.30'
]

def spring_version="4.3.18.RELEASE"
def spring_version="4.3.27.RELEASE"
List spring =[
"org.springframework:spring-core:$spring_version",
"org.springframework:spring-beans:$spring_version",
Expand All @@ -52,10 +52,17 @@ List alibaba = [
dependencies {
compile logger,spring,alibaba
compile 'org.apache.commons:commons-lang3:3.1'
compile "com.fasterxml.jackson.core:jackson-databind:2.9.6"
compile 'io.netty:netty-all:4.1.15.Final'
runtime 'org.apache.commons:commons-lang3:3.1'

compile "com.fasterxml.jackson.core:jackson-databind:2.11.0"
runtime "com.fasterxml.jackson.core:jackson-databind:2.11.0"
compile 'io.netty:netty-all:4.1.50.Final'
runtime 'io.netty:netty-all:4.1.50.Final'

compile 'io.netty:netty-tcnative:2.0.18.Final'
compile 'com.google.guava:guava:19.0'
runtime 'io.netty:netty-tcnative:2.0.18.Final'
compile 'com.google.guava:guava:29.0-jre'
runtime 'com.google.guava:guava:29.0-jre'

// web3j依赖
compile 'org.apache.httpcomponents:httpclient:4.5.5',
Expand Down
2 changes: 1 addition & 1 deletion release_note.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
V1.2.4
V1.2.4.0

0 comments on commit e528bff

Please sign in to comment.