diff --git a/README-EN.md b/README-EN.md index 13e3e85f1..47319f081 100644 --- a/README-EN.md +++ b/README-EN.md @@ -128,18 +128,18 @@ Each module can be introduced individually, or all modules can be introduced by cn.hutool.v7 hutool-all - 7.0.0.M1 + 7.0.0-M1 ``` ### 🍐Gradle ``` -implementation 'cn.hutool.v7:hutool-all:7.0.0.M1' +implementation 'cn.hutool.v7:hutool-all:7.0.0-M1' ``` ## 📥Download -- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/v7/hutool-all/7.0.0.M1/) +- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/v7/hutool-all/7.0.0-M1/) > 🔔️note: > Hutool 7.x supports JDK17 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 f0abaa954..19956c52b 100644 --- a/README.md +++ b/README.md @@ -131,21 +131,21 @@ Hutool目前主要版本4.x、5.x、6.x、7.x,选择如下: cn.hutool.v7 hutool-all - 7.0.0.M1 + 7.0.0-M1 ``` ### 🍐Gradle ``` -implementation 'cn.hutool.v7:hutool-all:7.0.0.M1' +implementation 'cn.hutool.v7:hutool-all:7.0.0-M1' ``` ### 📥下载jar 点击以下链接,下载`hutool-all-X.X.X.jar`即可: -- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/v7/hutool-all/7.0.0.M1/) +- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/v7/hutool-all/7.0.0-M1/) > 🔔️注意 > Hutool 7.x支持JDK17,对Android平台没有测试,不能保证所有工具类或工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index 649ef9b6d..ad467e652 100644 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -7.0.0.M1 +7.0.0-M1 diff --git a/docs/js/version.js b/docs/js/version.js index b47b01512..42823ef6f 100755 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '7.0.0.M1' +var version = '7.0.0-M1' diff --git a/hutool-ai/pom.xml b/hutool-ai/pom.xml index a6a650026..e7f6dfbf3 100644 --- a/hutool-ai/pom.xml +++ b/hutool-ai/pom.xml @@ -9,7 +9,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-ai diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 29b81a442..744f67cbb 100755 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-all diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index 1ca95320e..f4019ea8a 100755 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-bom diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index b2425be01..c4d092b6e 100755 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-core diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index 0e6bcbe86..55589a328 100755 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-cron diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 60cc5403e..974fcac83 100755 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-crypto diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index bc9ee0396..41eab3f9f 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-db diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 811b4e6fc..ee374ff44 100755 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-extra diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index 095327858..e13eff3c4 100755 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-http @@ -41,6 +41,7 @@ 12.0.19 11.0.6 1.4.3 + 6.1.0 @@ -78,8 +79,7 @@ jakarta.servlet jakarta.servlet-api - - 5.0.0 + ${jakarta.servlet-api.version} true diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 318ea4449..7a01ab975 100755 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-json diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index 6b82f8e62..a1635287f 100755 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-log diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index 33718b709..505370400 100755 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-poi diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index 3d06c0fe7..ed9b53020 100755 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-setting diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index 403ea80c5..629cc307e 100755 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-socket diff --git a/hutool-swing/pom.xml b/hutool-swing/pom.xml index ede285b78..532e040da 100755 --- a/hutool-swing/pom.xml +++ b/hutool-swing/pom.xml @@ -25,7 +25,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool-swing diff --git a/pom.xml b/pom.xml index 203a0f0a0..e95c0a982 100755 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ cn.hutool.v7 hutool-parent - 7.0.0.M1 + 7.0.0-M1 hutool Hutool是一个功能丰富且易用的Java工具库,通过诸多实用工具类的使用,旨在帮助开发者快速、便捷地完成各类开发任务。这些封装的工具涵盖了字符串、数字、集合、编码、日期、文件、IO、加密、数据库JDBC、JSON、HTTP客户端等一系列操作,可以满足各种不同的开发需求。 @@ -56,10 +56,10 @@ 17 - 5.11.3 - 1.18.36 - 2.0.20 - 1.79 + 5.12.2 + 1.18.38 + 2.1.20 + 1.80 2.18.1