From f07a452e3aa07a5bc9fd9c0d987f53c5e83417b9 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 10 Jun 2021 17:04:16 +0800 Subject: [PATCH] prepare 5.7.0 --- CHANGELOG.md | 2 +- README-EN.md | 6 +++--- README.md | 6 +++--- 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-jwt/pom.xml | 2 +- .../src/main/java/cn/hutool}/jwt/Claims.java | 4 ++-- .../src/main/java/cn/hutool}/jwt/JWT.java | 4 ++-- .../src/main/java/cn/hutool}/jwt/JWTHeader.java | 2 +- .../src/main/java/cn/hutool}/jwt/JWTPayload.java | 2 +- hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java | 4 ++++ .../src/main/java/cn/hutool}/jwt/signers/JWTSigner.java | 2 +- .../src/main/java/cn/hutool/jwt/signers/package-info.java | 4 ++++ hutool-log/pom.xml | 2 +- hutool-poi/pom.xml | 2 +- hutool-script/pom.xml | 2 +- hutool-setting/pom.xml | 2 +- hutool-socket/pom.xml | 2 +- hutool-system/pom.xml | 2 +- pom.xml | 2 +- 34 files changed, 46 insertions(+), 38 deletions(-) rename {hutool-json/src/main/java/cn/hutool/json => hutool-jwt/src/main/java/cn/hutool}/jwt/Claims.java (92%) rename {hutool-json/src/main/java/cn/hutool/json => hutool-jwt/src/main/java/cn/hutool}/jwt/JWT.java (95%) rename {hutool-json/src/main/java/cn/hutool/json => hutool-jwt/src/main/java/cn/hutool}/jwt/JWTHeader.java (97%) rename {hutool-json/src/main/java/cn/hutool/json => hutool-jwt/src/main/java/cn/hutool}/jwt/JWTPayload.java (99%) create mode 100644 hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java rename {hutool-json/src/main/java/cn/hutool/json => hutool-jwt/src/main/java/cn/hutool}/jwt/signers/JWTSigner.java (90%) create mode 100644 hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dc7e39ca..b69334025 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ------------------------------------------------------------------------------------------------------------- -# 5.6.8 (2021-06-10) +# 5.7.0 (2021-06-10) ### 🐣新特性 * 【crypto 】 SymmetricCrypto增加update方法（pr#1642@Github） diff --git a/README-EN.md b/README-EN.md index 76a734d90..a791ae9dd 100644 --- a/README-EN.md +++ b/README-EN.md @@ -122,18 +122,18 @@ Each module can be introduced individually, or all modules can be introduced by cn.hutool hutool-all - 5.6.8 + 5.7.0 ``` ### 🍐Gradle ``` -compile 'cn.hutool:hutool-all:5.6.8' +compile 'cn.hutool:hutool-all:5.7.0' ``` ## 📥Download -- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.6.8/) +- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.7.0/) > 🔔️note: > Hutool 5.x supports JDK8+ and is not tested on Android platforms, and cannot guarantee that all tool classes or tool methods are available. diff --git a/README.md b/README.md index 23b9c6f21..1dcadd31e 100644 --- a/README.md +++ b/README.md @@ -120,20 +120,20 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不 cn.hutool hutool-all - 5.6.8 + 5.7.0 ``` ### 🍐Gradle ``` -compile 'cn.hutool:hutool-all:5.6.8' +compile 'cn.hutool:hutool-all:5.7.0' ``` ### 📥下载jar 点击以下链接，下载`hutool-all-X.X.X.jar`即可： -- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.6.8/) +- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.7.0/) > 🔔️注意 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index 349e9d028..42cdd0b54 100755 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -5.6.8 +5.7.0 diff --git a/docs/js/version.js b/docs/js/version.js index ce09b9fd7..513c1031f 100644 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '5.6.8' \ No newline at end of file +var version = '5.7.0' \ No newline at end of file diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 164498354..e542837e7 100644 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-all diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index 8fb0925c5..a51a35814 100644 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-aop diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index ce76d5f67..758e9f102 100644 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-bloomFilter diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index caedad348..ccc4a0cd2 100644 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-bom diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 558a6b454..384260dd0 100644 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-cache diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index e88a5cfed..32c4ec132 100644 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-captcha diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index 9f28defa6..2dc82d7a9 100644 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-core diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 5d4e89607..0bd46c435 100644 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 58c9e7db3..cd3a712e8 100644 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index 2d07b9337..bcdcdab30 100644 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-db diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index d049d83a2..77f89887d 100644 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-dfa diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 4c295160d..3371e52d3 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 9b42b4a80..420907d45 100644 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-http diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 31314acff..a7436e9dc 100644 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-json diff --git a/hutool-jwt/pom.xml b/hutool-jwt/pom.xml index 818806ec9..9accffc77 100644 --- a/hutool-jwt/pom.xml +++ b/hutool-jwt/pom.xml @@ -7,7 +7,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-jwt diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java b/hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java similarity index 92% rename from hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java rename to hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java index 86020fddc..2b7f7d593 100644 --- a/hutool-json/src/main/java/cn/hutool/json/jwt/Claims.java +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/Claims.java @@ -1,4 +1,4 @@ -package cn.hutool.json.jwt; +package cn.hutool.jwt; import cn.hutool.core.lang.Assert; import cn.hutool.json.JSONObject; @@ -6,7 +6,7 @@ import cn.hutool.json.JSONObject; import java.io.Serializable; /** - * Claims 认证 + * Claims 认证，简单的JSONObject包装 * * @author looly */ diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java similarity index 95% rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java rename to hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java index d7090b58f..c63085129 100644 --- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWT.java +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/JWT.java @@ -1,9 +1,9 @@ -package cn.hutool.json.jwt; +package cn.hutool.jwt; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.jwt.signers.JWTSigner; +import cn.hutool.jwt.signers.JWTSigner; import java.nio.charset.Charset; diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java similarity index 97% rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java rename to hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java index 7cda2fa24..323ba0c71 100644 --- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTHeader.java +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTHeader.java @@ -1,4 +1,4 @@ -package cn.hutool.json.jwt; +package cn.hutool.jwt; import java.util.Map; diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java similarity index 99% rename from hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java rename to hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java index 267162dc3..30cb8b922 100644 --- a/hutool-json/src/main/java/cn/hutool/json/jwt/JWTPayload.java +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/JWTPayload.java @@ -1,4 +1,4 @@ -package cn.hutool.json.jwt; +package cn.hutool.jwt; import java.util.Date; import java.util.Map; diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java b/hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java new file mode 100644 index 000000000..f2670a9ed --- /dev/null +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/package-info.java @@ -0,0 +1,4 @@ +/** + * JSON Web Token (JWT)封装 + */ +package cn.hutool.jwt; diff --git a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java similarity index 90% rename from hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java rename to hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java index 52770ab6e..a217173d0 100644 --- a/hutool-json/src/main/java/cn/hutool/json/jwt/signers/JWTSigner.java +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/JWTSigner.java @@ -1,4 +1,4 @@ -package cn.hutool.json.jwt.signers; +package cn.hutool.jwt.signers; /** * JWT签名接口封装，通过实现此接口，完成不同算法的签名功能 diff --git a/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java new file mode 100644 index 000000000..c3665e9a3 --- /dev/null +++ b/hutool-jwt/src/main/java/cn/hutool/jwt/signers/package-info.java @@ -0,0 +1,4 @@ +/** + * JWT签名封装 + */ +package cn.hutool.jwt.signers; diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index e1d649139..c56941e4e 100644 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index 30eb76867..665acccc3 100644 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-poi diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index 26fb8b46d..b509201cd 100644 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-script diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index 2ebb31cfb..a0e4c7574 100644 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index 139a618b1..108bb5550 100644 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-socket diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index f24e716b0..123aa278a 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool-system diff --git a/pom.xml b/pom.xml index 352894849..092e89b00 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ cn.hutool hutool-parent - 5.6.8-SNAPSHOT + 5.7.0-SNAPSHOT hutool Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。 https://github.com/looly/hutool