From 653ba7ff1de2521b04f6600e0be9d73dc6a36057 Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 16 Feb 2020 11:11:03 +0800 Subject: [PATCH] prepare 5.1.4 --- CHANGELOG.md | 2 +- README.md | 8 ++++---- bin/version.txt | 2 +- docs/js/version.js | 2 +- hutool-all/pom.xml | 2 +- hutool-aop/pom.xml | 2 +- hutool-bloomFilter/pom.xml | 2 +- hutool-bom/pom.xml | 2 +- hutool-cache/pom.xml | 2 +- hutool-captcha/pom.xml | 2 +- hutool-core/pom.xml | 2 +- hutool-cron/pom.xml | 2 +- hutool-crypto/pom.xml | 2 +- hutool-db/pom.xml | 2 +- hutool-dfa/pom.xml | 2 +- hutool-extra/pom.xml | 2 +- hutool-http/pom.xml | 2 +- hutool-json/pom.xml | 2 +- hutool-log/pom.xml | 2 +- hutool-poi/pom.xml | 10 +++++++++- hutool-script/pom.xml | 2 +- hutool-setting/pom.xml | 2 +- hutool-socket/pom.xml | 2 +- hutool-system/pom.xml | 2 +- pom.xml | 2 +- 25 files changed, 36 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae756fd12..8a4660ff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -## 5.2.0 +## 5.1.4 ### 新特性 ### Bug修复 diff --git a/README.md b/README.md index f5aa033c9..2b8712a59 100644 --- a/README.md +++ b/README.md @@ -116,21 +116,21 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不 cn.hutool hutool-all - 5.2.0 + 5.1.4 ``` ### Gradle ``` -compile 'cn.hutool:hutool-all:5.2.0' +compile 'cn.hutool:hutool-all:5.1.4' ``` ### 非Maven项目 点击以下任一链接，下载`hutool-all-X.X.X.jar`即可： -- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.2.0/) -- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.2.0/) +- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.1.4/) +- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.1.4/) > 注意 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类获工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index 91ff57278..76e9e619d 100755 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -5.2.0 +5.1.4 diff --git a/docs/js/version.js b/docs/js/version.js index 6edc874ca..0076d7423 100644 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '5.2.0' \ No newline at end of file +var version = '5.1.4' \ No newline at end of file diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 5d8370582..2359495d2 100644 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index e6a967516..55c678bcf 100644 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index 50db780b5..fb3b40c4e 100644 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-bloomFilter diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index af290867b..63e78cdf0 100644 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-bom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index f79791807..97135dde8 100644 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index 6869b9e6a..7c98b71ff 100644 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index afccd19fe..d0eeb0dab 100644 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-core diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index c95813918..ddfd8655f 100644 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 17291e026..c11c28519 100644 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index b5995a6e5..c6d7518e1 100644 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index 099d877d6..f4ce22187 100644 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 06036ed4e..0d24cd836 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index d101a8938..f80e8314e 100644 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 3c44338c6..cad7f807c 100644 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-json diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index 6e1c975cb..2a7977a45 100644 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index b9e633797..d18b020d5 100644 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-poi @@ -19,6 +19,7 @@ 4.1.1 2.12.0 + 2.1.6 @@ -48,5 +49,12 @@ compile true + + com.alibaba + easyexcel + ${easyexcel.version} + compile + true + diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index 1010d9711..907cf98c8 100644 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index e93167157..d83df3fc9 100644 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index 432ad0ce7..c9b7ee2e6 100644 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 18b5f09d5..d730e88f3 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool-system diff --git a/pom.xml b/pom.xml index 66debdaa1..f50e9c94b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.2.0-SNAPSHOT + 5.1.4-SNAPSHOT hutool 提供丰富的Java工具方法 https://github.com/looly/hutool