Prepare release

dromara · Oct 21, 2021 · 0d8dfb7 · 0d8dfb7
2 parents 6b4e775 + 31db52d
commit 0d8dfb7
Show file tree

Hide file tree

Showing 108 changed files with 2,066 additions and 435 deletions.
diff --git a/.github/codeql-analysis.yml b/.github/codeql-analysis.yml
@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ v5-dev ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ v5-dev ]
+  schedule:
+    - cron: '45 6 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,34 @@
 
 -------------------------------------------------------------------------------------------------------------
 
+# 5.7.15 (2021-10-21)
+
+### 🐣新特性
+* 【db     】     Db.quietSetAutoCommit增加判空（issue#I4D75B@Gitee）
+* 【core   】     增加RingIndexUtil（pr#438@Gitee）
+* 【core   】     Assert增加checkBetween重载（pr#436@Gitee）
+* 【core   】     ReUtil增加命名分组重载（pr#439@Gitee）
+* 【json   】     toString和writer增加Filter（issue#I4DQNQ@Gitee）
+* 【core   】     ContentType增加build重载（pr#1898@Github）
+* 【bom    】     支持scope=import方式引入（issue#1561@Github）
+* 【core   】     新增Hash接口，HashXXX继承此接口
+* 【core   】     ZipUtil增加append方法（pr#441@Gitee）
+* 【core   】     CollUtil增加重载（issue#I4E9FS@Gitee）
+* 【core   】     CopyOptions新增setFieldValueEditor（issue#I4E08T@Gitee）
+
+### 🐞Bug修复
+* 【core   】     修复CollUtil.isEqualList两个null返回错误问题（issue#1885@Github）
+* 【poi    】     修复ExcelWriter多余调试信息导致的问题（issue#1884@Github）
+* 【poi    】     修复TemporalAccessorUtil.toInstant使用DateTimeFormatter导致问题（issue#1891@Github）
+* 【poi    】     修复sheet.getRow(y)为null导致的问题（issue#1893@Github）
+* 【cache  】     修复LRUCache线程安全问题（issue#1895@Github）
+* 【crypto 】     修复KeyUtil异常信息参数丢失问题（issue#1902@Github）
+* 【core   】     修复StrUtil.split和splittoArray不一致问题（issue#I4ELU5@Github）
+* 【core   】     修复SymmetricCrypto未关闭CipherOutputStream导致的问题（issue#I4EMST@Gitee）
+* 【core   】     修复QueryBuilder对/转义问题（issue#1904@Github）
+
+-------------------------------------------------------------------------------------------------------------
+
 # 5.7.14 (2021-10-09)
 
 ### 🐣新特性

diff --git a/README-EN.md b/README-EN.md
@@ -117,25 +117,43 @@ Each module can be introduced individually, or all modules can be introduced by
 
 -------------------------------------------------------------------------------
 
+## 🪙Support Hutool
+
+### 💳Donate
+
+If you think Hutool is good, you can donate to buy the author a pack of chili~, thanks in advance ^_^.
+
+[Gitee donate](https://gitee.com/dromara/hutool)
+
+[Dromara donate](https://dromara.gitee.io/donate.html)
+
+### 👕Shop about Hutool
+
+We provide the T-Shirt and Sweater with Hutool Logo, please visit the shop：
+
+👉 [Hutool Shop](https://m.tb.cn/h.fVxoBOm?sm=2756b2) 👈
+
+-------------------------------------------------------------------------------
+
 ## 📦Install
 
 ### 🍊Maven
 ```xml
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.7.14</version>
+    <version>5.7.15</version>
 </dependency>
 ```
 
 ### 🍐Gradle
 ```
-implementation 'cn.hutool:hutool-all:5.7.14'
+implementation 'cn.hutool:hutool-all:5.7.15'
 ```
 
 ## 📥Download
 
-- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.7.14/)
+- [Maven Repo](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.7.15/)
 
 > 🔔️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.
@@ -191,24 +209,6 @@ Hutool welcomes anyone to contribute code to Hutool, but the author suffers from
 
 [![Stargazers over time](https://starchart.cc/dromara/hutool.svg)](https://starchart.cc/dromara/hutool)
 
-## 💳Donate
-
-If you think Hutool is good, you can donate to buy tshe author a pack of chili~, thanks in advance ^_^.
-
-[Gitee donate](https://gitee.com/dromara/hutool)
-
-[Dromara donate](https://dromara.gitee.io/donate.html)
-
-## 👕shop
-
-We provide the T-Shirt with Hutool Logo, please visit the shop：
-
-[Hutool T-Shirt](https://m.tb.cn/h.f47W8zc?sm=7d2b95)
-
-<div align="center">
-	<img src="https://cdn.jsdelivr.net/gh/looly/hutool-site/images/t_shirt.jpg">
-</div>
-
 ## 📌WeChat Official Account
 
 <div align="center">

diff --git a/README.md b/README.md
@@ -113,6 +113,26 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不
 
 -------------------------------------------------------------------------------
 
+## 🪙支持Hutool
+
+### 💳捐赠
+
+如果你觉得Hutool不错，可以捐赠请维护者吃包辣条~，在此表示感谢^_^。
+
+[Gitee上捐赠](https://gitee.com/dromara/hutool)
+
+[捐赠给Dromara组织](https://dromara.gitee.io/donate.html)
+
+### 👕周边商店
+
+你也可以通过购买Hutool的周边商品来支持Hutool维护哦！
+
+我们提供了印有Hutool Logo的周边商品，欢迎点击购买支持：
+
+👉 [Hutool 周边商店](https://m.tb.cn/h.fVxoBOm?sm=2756b2) 👈
+
+-------------------------------------------------------------------------------
+
 ## 📦安装
 
 ### 🍊Maven
@@ -122,24 +142,24 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.7.14</version>
+    <version>5.7.15</version>
 </dependency>
 ```
 
 ### 🍐Gradle
 ```
-implementation 'cn.hutool:hutool-all:5.7.14'
+implementation 'cn.hutool:hutool-all:5.7.15'
 ```
 
 ### 📥下载jar
 
 点击以下链接，下载`hutool-all-X.X.X.jar`即可：
 
-- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.7.14/)
+- [Maven中央库](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.7.15/)
 
 > 🔔️注意
 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。
-> 如果你的项目使用JDK7，请使用Hutool 4.x版本
+> 如果你的项目使用JDK7，请使用Hutool 4.x版本（不再更新）
 
 ### 🚽编译安装
 
@@ -198,26 +218,6 @@ Hutool欢迎任何人为Hutool添砖加瓦，贡献代码，不过维护者是
 
 [![Stargazers over time](https://starchart.cc/dromara/hutool.svg)](https://starchart.cc/dromara/hutool)
 
-## 💳捐赠
-
-如果你觉得Hutool不错，可以捐赠请维护者吃包辣条~，在此表示感谢^_^。
-
-点击以下链接，将页面拉到最下方点击“捐赠”即可。
-
-[Gitee上捐赠](https://gitee.com/dromara/hutool)
-
-[捐赠给Dromara组织](https://dromara.gitee.io/donate.html)
-
-## 👕周边
-
-我们提供了印有Hutool Logo的主题T恤，欢迎点击购买：
-
-[HutoolT恤商店](https://m.tb.cn/h.f47W8zc?sm=7d2b95)
-
-<div align="center">
-	<img src="https://cdn.jsdelivr.net/gh/looly/hutool-site/images/t_shirt.jpg">
-</div>
-
 ## 📌公众号
 
 <div align="center">

diff --git a/SECURITY.md b/SECURITY.md
@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions（支持的版本）
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.x.x   | :white_check_mark: |
+| 4.x.x   | :x:                |
+| 3.x.x   | :x:                |
+
+## Reporting a Vulnerability（报告漏洞）
+
+如果你发现有安全问题或漏洞，请发送邮件到`[email protected]`。
+
+To report any found security issues or vulnerabilities, please send a mail to `[email protected]`.
diff --git a/bin/version.txt b/bin/version.txt
@@ -1 +1 @@
-5.7.14
+5.7.15
diff --git a/docs/js/version.js b/docs/js/version.js
@@ -1 +1 @@
-var version = '5.7.14'
+var version = '5.7.15'
diff --git a/hutool-all/pom.xml b/hutool-all/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.7.14</version>
+		<version>5.7.15</version>
 	</parent>
 
 	<artifactId>hutool-all</artifactId>

diff --git a/hutool-aop/pom.xml b/hutool-aop/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.7.14</version>
+		<version>5.7.15</version>
 	</parent>
 
 	<artifactId>hutool-aop</artifactId>

diff --git a/hutool-bloomFilter/pom.xml b/hutool-bloomFilter/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.7.14</version>
+		<version>5.7.15</version>
 	</parent>
 
 	<artifactId>hutool-bloomFilter</artifactId>

diff --git a/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilter.java b/hutool-bloomFilter/src/main/java/cn/hutool/bloomfilter/BloomFilter.java
@@ -20,10 +20,10 @@ public interface BloomFilter extends Serializable{
 
 	/**
 	 * 在boolean的bitMap中增加一个字符串<br>
-	 * 如果存在就返回<code>false</code> .如果不存在.先增加这个字符串.再返回<code>true</code>
+	 * 如果存在就返回{@code false} .如果不存在.先增加这个字符串.再返回{@code true}
 	 *
 	 * @param str 字符串
-	 * @return 是否加入成功，如果存在就返回<code>false</code> .如果不存在返回<code>true</code>
+	 * @return 是否加入成功，如果存在就返回{@code false} .如果不存在返回{@code true}
 	 */
 	boolean add(String str);
-}
+}