From 2a59260db00f9785b93cae7d417895f14ae5129c Mon Sep 17 00:00:00 2001 From: Looly <loolly@gmail.com> Date: Mon, 16 Sep 2019 19:27:42 +0800 Subject: [PATCH] prepare 4.6.7 --- CHANGELOG.md | 11 +++++++++-- 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 | 2 +- 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(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f565671c6..96e9912cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,19 @@ ------------------------------------------------------------------------------------------------------------- +## 4.6.7 + +### 新特性 +### Bug修复 + +------------------------------------------------------------------------------------------------------------- + ## 4.6.6 ### 新特性 * 【core】 MapUtil增加newConcurrentHashMap(pr#538@Github) -* 【core】 增加StopWatch(issuepr#539@Github) -* 【core】 增加ZipUtil.listFiles(issuepr#541@Github) +* 【core】 增加StopWatch(issue#539@Github) +* 【core】 增加ZipUtil.listFiles(issue#541@Github) ### Bug修复 * 【core】 修复DateUtil.endOfYear计算错误问题(issuepr#540@Github) diff --git a/README.md b/README.md index 0d07b39a1..17450f464 100644 --- a/README.md +++ b/README.md @@ -108,21 +108,21 @@ Hutool的目标是使用一个工具方法代替一段复杂代码,从而最 <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> - <version>4.6.6</version> + <version>4.6.7</version> </dependency> ``` ### Gradle ``` -compile 'cn.hutool:hutool-all:4.6.6' +compile 'cn.hutool:hutool-all:4.6.7' ``` ### 非Maven项目 点击以下任一链接,下载`hutool-all-X.X.X.jar`即可: -- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/4.6.6/) -- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/4.6.6/) +- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/4.6.7/) +- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/4.6.7/) > 注意 > Hutool支持JDK7+,对Android平台没有测试,不能保证所有工具类获工具方法可用。 diff --git a/bin/version.txt b/bin/version.txt index ec3f25fb5..5c6b98ff7 100755 --- a/bin/version.txt +++ b/bin/version.txt @@ -1 +1 @@ -4.6.6 +4.6.7 diff --git a/docs/js/version.js b/docs/js/version.js index afe7751ba..85957e30e 100644 --- a/docs/js/version.js +++ b/docs/js/version.js @@ -1 +1 @@ -var version = '4.6.6' \ No newline at end of file +var version = '4.6.7' \ No newline at end of file diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml index 14291e0ff..9a2a37956 100644 --- a/hutool-all/pom.xml +++ b/hutool-all/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-all</artifactId> diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml index ed0fccd44..9be58ddab 100644 --- a/hutool-aop/pom.xml +++ b/hutool-aop/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-aop</artifactId> diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml index 5cb53efea..15f52de03 100644 --- a/hutool-bloomFilter/pom.xml +++ b/hutool-bloomFilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-bloomFilter</artifactId> diff --git a/hutool-bom/pom.xml b/hutool-bom/pom.xml index f65ad0047..304f39832 100644 --- a/hutool-bom/pom.xml +++ b/hutool-bom/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-bom</artifactId> diff --git a/hutool-cache/pom.xml b/hutool-cache/pom.xml index 59bf1d931..d14fd69e8 100644 --- a/hutool-cache/pom.xml +++ b/hutool-cache/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-cache</artifactId> diff --git a/hutool-captcha/pom.xml b/hutool-captcha/pom.xml index 21321429e..c57583669 100644 --- a/hutool-captcha/pom.xml +++ b/hutool-captcha/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-captcha</artifactId> diff --git a/hutool-core/pom.xml b/hutool-core/pom.xml index a2aaef77c..6a6a5a632 100644 --- a/hutool-core/pom.xml +++ b/hutool-core/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-core</artifactId> diff --git a/hutool-cron/pom.xml b/hutool-cron/pom.xml index d1544115c..6c3504f29 100644 --- a/hutool-cron/pom.xml +++ b/hutool-cron/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-cron</artifactId> diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml index 464b249e3..bf5140b6f 100644 --- a/hutool-crypto/pom.xml +++ b/hutool-crypto/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-crypto</artifactId> diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index 2c69bbea5..b7e341f3d 100644 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-db</artifactId> diff --git a/hutool-dfa/pom.xml b/hutool-dfa/pom.xml index e65acf046..4ab01e4a1 100644 --- a/hutool-dfa/pom.xml +++ b/hutool-dfa/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-dfa</artifactId> diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml index 2a4d51fbd..fc763469a 100644 --- a/hutool-extra/pom.xml +++ b/hutool-extra/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-extra</artifactId> diff --git a/hutool-http/pom.xml b/hutool-http/pom.xml index c4eb52456..c1d78a195 100644 --- a/hutool-http/pom.xml +++ b/hutool-http/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-http</artifactId> diff --git a/hutool-json/pom.xml b/hutool-json/pom.xml index 2d46fac35..b4f4ce847 100644 --- a/hutool-json/pom.xml +++ b/hutool-json/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-json</artifactId> diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml index ad8a82ca9..4c39b98f6 100644 --- a/hutool-log/pom.xml +++ b/hutool-log/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-log</artifactId> diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml index f1cdefbde..6f0d9b70f 100644 --- a/hutool-poi/pom.xml +++ b/hutool-poi/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-poi</artifactId> diff --git a/hutool-script/pom.xml b/hutool-script/pom.xml index f34e2f38b..7edbacdec 100644 --- a/hutool-script/pom.xml +++ b/hutool-script/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-script</artifactId> diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml index d9036c5b8..b6e5cb5c3 100644 --- a/hutool-setting/pom.xml +++ b/hutool-setting/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-setting</artifactId> diff --git a/hutool-socket/pom.xml b/hutool-socket/pom.xml index fe02f3290..008d5254f 100644 --- a/hutool-socket/pom.xml +++ b/hutool-socket/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-socket</artifactId> diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml index 09b6c052c..d6ee3e04f 100644 --- a/hutool-system/pom.xml +++ b/hutool-system/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> </parent> <artifactId>hutool-system</artifactId> diff --git a/pom.xml b/pom.xml index c008e935c..e2e28aa3b 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ <groupId>cn.hutool</groupId> <artifactId>hutool-parent</artifactId> - <version>4.6.6</version> + <version>4.6.7-SNAPSHOT</version> <name>hutool</name> <description>提供丰富的Java工具方法</description> <url>https://github.com/looly/hutool</url>