Merge remote-tracking branch 'upstream/v5-dev' into v5-dev

CHANGELOG.md

@@ -3,6 +3,16 @@
 
 -------------------------------------------------------------------------------------------------------------
 
+# 5.5.3 (2020-12-02)
+
+### 新特性
+* 【core   】     IdcardUtil增加行政区划83（issue#1277@Github）
+* 【core   】     multipart中int改为long，解决大文件上传越界问题（issue#I27WZ3@Gitee）
+
+### Bug修复
+
+-------------------------------------------------------------------------------------------------------------
+
 # 5.5.2 (2020-12-01)
 
 ### 新特性

README-EN.md

@@ -125,19 +125,19 @@ Each module can be introduced individually, or all modules can be introduced by
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.5.2</version>
+    <version>5.5.3</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-compile 'cn.hutool:hutool-all:5.5.2'
+compile 'cn.hutool:hutool-all:5.5.3'
 ```
 
 ## Download
 
-- [Maven1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.5.2/)
+- [Maven1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.5.3/)
-- [Maven2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.5.2/)
+- [Maven2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.5.3/)
 
 > 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.

README.md

@@ -123,21 +123,21 @@ Hutool的存在就是为了减少代码搜索成本，避免网络上参差不
 <dependency>
     <groupId>cn.hutool</groupId>
     <artifactId>hutool-all</artifactId>
-    <version>5.5.2</version>
+    <version>5.5.3</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-compile 'cn.hutool:hutool-all:5.5.2'
+compile 'cn.hutool:hutool-all:5.5.3'
 ```
 
 ### 非Maven项目
 
 点击以下任一链接，下载`hutool-all-X.X.X.jar`即可：
 
-- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.5.2/)
+- [Maven中央库1](https://repo1.maven.org/maven2/cn/hutool/hutool-all/5.5.3/)
-- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.5.2/)
+- [Maven中央库2](http://repo2.maven.org/maven2/cn/hutool/hutool-all/5.5.3/)
 
 > 注意
 > Hutool 5.x支持JDK8+，对Android平台没有测试，不能保证所有工具类或工具方法可用。

bin/version.txt

@@ -1 +1 @@
-5.5.2
+5.5.3

docs/js/version.js

@@ -1 +1 @@
-var version = '5.5.2'
+var version = '5.5.3'

hutool-all/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-all</artifactId>

hutool-aop/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-aop</artifactId>
@@ -19,7 +19,7 @@
 	<properties>
 		<!-- versions -->
 		<cglib.version>3.3.0</cglib.version>
-		<spring.version>5.2.9.RELEASE</spring.version>
+		<spring.version>5.3.1</spring.version>
 	</properties>
 
 	<dependencies>

hutool-bloomFilter/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-bloomFilter</artifactId>

hutool-bom/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-bom</artifactId>

hutool-cache/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-cache</artifactId>

hutool-captcha/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-captcha</artifactId>

hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java

@@ -38,7 +38,7 @@ public class GifCaptcha extends AbstractCaptcha {
 	 * @param height 验证码高度
 	 */
 	public GifCaptcha(int width, int height) {
-		this(width, height, 100);
+		this(width, height, 5);
 	}
 
 	/**

hutool-core/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-core</artifactId>

hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartFormData.java

@@ -2,9 +2,9 @@ package cn.hutool.core.net.multipart;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.multi.ListValueMap;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -78,10 +78,7 @@ public class MultipartFormData {
 				putFile(header.formFieldName, newFile);
 			} else {
 				// 标准表单项
-				ByteArrayOutputStream fbos = new ByteArrayOutputStream(1024);
+				putParameter(header.formFieldName, IoUtil.read(input, charset));
-				input.copy(fbos);
-				String value = (charset != null) ? new String(fbos.toByteArray(), charset) : new String(fbos.toByteArray());
-				putParameter(header.formFieldName, value);
 			}
 
 			input.skipBytes(1);

hutool-core/src/main/java/cn/hutool/core/net/multipart/MultipartRequestInputStream.java

@@ -171,7 +171,7 @@ public class MultipartRequestInputStream extends BufferedInputStream {
 	 * @return 复制的字节数
 	 * @throws IOException 读取异常
 	 */
-	public int copy(OutputStream out, int limit) throws IOException {
+	public int copy(OutputStream out, long limit) throws IOException {
 		int count = 0;
 		while (true) {
 			byte b = readByte();

hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFile.java

@@ -7,7 +7,6 @@ import cn.hutool.core.util.StrUtil;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -24,7 +23,7 @@ public class UploadFile {
 	private final UploadFileHeader header;
 	private final UploadSetting setting;
 
-	private int size = -1;
+	private long size = -1;
 
 	// 文件流（小文件位于内存中）
 	private byte[] data;
@@ -150,7 +149,7 @@ public class UploadFile {
 	/**
 	 * @return 上传文件的大小，> 0 表示未上传
 	 */
-	public int size() {
+	public long size() {
 		return size;
 	}
 
@@ -200,13 +199,13 @@ public class UploadFile {
 
 		// 处理硬盘文件
 		tempFile = FileUtil.createTempFile(TMP_FILE_PREFIX, TMP_FILE_SUFFIX, FileUtil.touch(setting.tmpUploadPath), false);
-		BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(tempFile));
+		final BufferedOutputStream out = FileUtil.getOutputStream(this.tempFile);
 		if (data != null) {
 			size = data.length;
 			out.write(data);
 			data = null; // not needed anymore
 		}
-		int maxFileSize = setting.maxFileSize;
+		final long maxFileSize = setting.maxFileSize;
 		try {
 			if (maxFileSize == -1) {
 				size += input.copy(out);
@@ -236,14 +235,14 @@ public class UploadFile {
 	 * @return 是否为允许的扩展名
 	 */
 	private boolean isAllowedExtension() {
-		String[] exts = setting.fileExts;
+		final String[] exts = setting.fileExts;
 		boolean isAllow = setting.isAllowFileExts;
 		if (exts == null || exts.length == 0) {
 			// 如果给定扩展名列表为空，当允许扩展名时全部允许，否则全部禁止
 			return isAllow;
 		}
 
-		String fileNameExt = FileUtil.extName(this.getFileName());
+		final String fileNameExt = FileUtil.extName(this.getFileName());
 		for (String fileExtension : setting.fileExts) {
 			if (fileNameExt.equalsIgnoreCase(fileExtension)) {
 				return isAllow;

hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadFileHeader.java

@@ -31,7 +31,8 @@ public class UploadFileHeader {
 	// ---------------------------------------------------------------- public interface
 
 	/**
-	 * Returns <code>true</code> if uploaded data are correctly marked as a file. This is true if header contains string 'filename'.
+	 * Returns {@code true} if uploaded data are correctly marked as a file.<br>
+	 * This is true if header contains string 'filename'.
 	 *
 	 * @return 是否为文件
 	 */

hutool-core/src/main/java/cn/hutool/core/net/multipart/UploadSetting.java

@@ -9,7 +9,7 @@ package cn.hutool.core.net.multipart;
 public class UploadSetting {
 
 	/** 最大文件大小，默认无限制 */
-	protected int maxFileSize = -1;
+	protected long maxFileSize = -1;
 	/** 文件保存到内存的边界 */
 	protected int memoryThreshold = 8192;
 	/** 临时文件目录 */
@@ -26,7 +26,7 @@ public class UploadSetting {
 	/**
 	 * @return 获得最大文件大小，-1表示无限制
 	 */
-	public int getMaxFileSize() {
+	public long getMaxFileSize() {
 		return maxFileSize;
 	}
 
@@ -35,7 +35,7 @@ public class UploadSetting {
 	 *
 	 * @param maxFileSize 最大文件大小
 	 */
-	public void setMaxFileSize(int maxFileSize) {
+	public void setMaxFileSize(long maxFileSize) {
 		this.maxFileSize = maxFileSize;
 	}
 

hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java

@@ -83,6 +83,8 @@ public class IdcardUtil {
 		CITY_CODES.put("71", "台湾");
 		CITY_CODES.put("81", "香港");
 		CITY_CODES.put("82", "澳门");
+		//issue#1277，台湾身份证号码以83开头，但是行政区划为71
+		CITY_CODES.put("83", "台湾");
 		CITY_CODES.put("91", "国外");
 
 		TW_FIRST_CODE.put("A", 10);
@@ -354,7 +356,7 @@ public class IdcardUtil {
 			sum = sum + Integer.parseInt(String.valueOf(c)) * iflag;
 			iflag--;
 		}
-		if ("A".equals(end.toUpperCase())) {
+		if ("A".equalsIgnoreCase(end)) {
 			sum += 10;
 		} else {
 			sum += Integer.parseInt(end);

hutool-core/src/test/java/cn/hutool/core/bean/BeanUtilTest.java

@@ -4,7 +4,6 @@ import cn.hutool.core.annotation.Alias;
 import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.bean.copier.ValueProvider;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.MapUtil;
 import lombok.Data;
 import lombok.Getter;

hutool-cron/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-cron</artifactId>

hutool-crypto/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-crypto</artifactId>

hutool-crypto/src/main/java/cn/hutool/crypto/SecureUtil.java

@@ -626,7 +626,7 @@ public final class SecureUtil {
 	 * 创建HMac对象，调用digest方法可获得hmac值
 	 *
 	 * @param algorithm {@link HmacAlgorithm}
-	 * @param key       密钥，如果为<code>null</code>生成随机密钥
+	 * @param key       密钥，如果为{@code null}生成随机密钥
 	 * @return {@link HMac}
 	 * @since 3.3.0
 	 */
@@ -638,7 +638,7 @@ public final class SecureUtil {
 	 * 创建HMac对象，调用digest方法可获得hmac值
 	 *
 	 * @param algorithm {@link HmacAlgorithm}
-	 * @param key       密钥，如果为<code>null</code>生成随机密钥
+	 * @param key       密钥，如果为{@code null}生成随机密钥
 	 * @return {@link HMac}
 	 * @since 3.0.3
 	 */
@@ -650,7 +650,7 @@ public final class SecureUtil {
 	 * 创建HMac对象，调用digest方法可获得hmac值
 	 *
 	 * @param algorithm {@link HmacAlgorithm}
-	 * @param key       密钥{@link SecretKey}，如果为<code>null</code>生成随机密钥
+	 * @param key       密钥{@link SecretKey}，如果为{@code null}生成随机密钥
 	 * @return {@link HMac}
 	 * @since 3.0.3
 	 */
@@ -664,7 +664,7 @@ public final class SecureUtil {
 	 * HmacMD5加密：hmacMd5(key).digest(data)<br>
 	 * HmacMD5加密并转为16进制字符串：hmacMd5(key).digestHex(data)<br>
 	 *
-	 * @param key 加密密钥，如果为<code>null</code>生成随机密钥
+	 * @param key 加密密钥，如果为{@code null}生成随机密钥
 	 * @return {@link HMac}
 	 * @since 3.3.0
 	 */
@@ -678,7 +678,7 @@ public final class SecureUtil {
 	 * HmacMD5加密：hmacMd5(key).digest(data)<br>
 	 * HmacMD5加密并转为16进制字符串：hmacMd5(key).digestHex(data)<br>
 	 *
-	 * @param key 加密密钥，如果为<code>null</code>生成随机密钥
+	 * @param key 加密密钥，如果为{@code null}生成随机密钥
 	 * @return {@link HMac}
 	 */
 	public static HMac hmacMd5(byte[] key) {
@@ -703,7 +703,7 @@ public final class SecureUtil {
 	 * HmacSHA1加密：hmacSha1(key).digest(data)<br>
 	 * HmacSHA1加密并转为16进制字符串：hmacSha1(key).digestHex(data)<br>
 	 *
-	 * @param key 加密密钥，如果为<code>null</code>生成随机密钥
+	 * @param key 加密密钥，如果为{@code null}生成随机密钥
 	 * @return {@link HMac}
 	 * @since 3.3.0
 	 */
@@ -717,7 +717,7 @@ public final class SecureUtil {
 	 * HmacSHA1加密：hmacSha1(key).digest(data)<br>
 	 * HmacSHA1加密并转为16进制字符串：hmacSha1(key).digestHex(data)<br>
 	 *
-	 * @param key 加密密钥，如果为<code>null</code>生成随机密钥
+	 * @param key 加密密钥，如果为{@code null}生成随机密钥
 	 * @return {@link HMac}
 	 */
 	public static HMac hmacSha1(byte[] key) {

hutool-crypto/src/main/java/cn/hutool/crypto/digest/Digester.java

@@ -1,14 +1,5 @@
 package cn.hutool.crypto.digest;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.nio.charset.Charset;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
@@ -19,6 +10,15 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.CryptoException;
 import cn.hutool.crypto.SecureUtil;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+
 /**
  * 摘要算法<br>
  * 注意：此对象实例化后为非线程安全！
@@ -84,7 +84,7 @@ public class Digester implements Serializable {
 	 * 
 	 * @param algorithm 算法
 	 * @param provider 算法提供者，null表示JDK默认，可以引入Bouncy Castle等来提供更多算法支持
-	 * @return {@link Digester}
+	 * @return Digester
 	 * @throws CryptoException Cause by IOException
 	 */
 	public Digester init(String algorithm, Provider provider) {

hutool-db/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-db</artifactId>

hutool-dfa/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-dfa</artifactId>

hutool-extra/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-extra</artifactId>
@@ -378,7 +378,7 @@
 		<dependency>
 			<groupId>com.googlecode.aviator</groupId>
 			<artifactId>aviator</artifactId>
-			<version>5.1.4</version>
+			<version>5.2.1</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>

hutool-http/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-http</artifactId>

hutool-json/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-json</artifactId>

hutool-json/src/main/java/cn/hutool/json/JSONArray.java

@@ -208,7 +208,7 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
 	}
 
 	/**
-	 * JSONArray转为以<code>separator</code>为分界符的字符串
+	 * JSONArray转为以{@code separator}为分界符的字符串
 	 *
 	 * @param separator 分界符
 	 * @return a string.

hutool-json/src/test/java/cn/hutool/json/JSONArrayTest.java

@@ -1,6 +1,7 @@
 package cn.hutool.json;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.convert.ConvertException;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.Console;
@@ -33,6 +34,14 @@ public class JSONArrayTest {
 		new JSONArray(new JSONObject(), JSONConfig.create());
 	}
 
+	@Test
+	public void addNullTest(){
+		final List<String> aaa = ListUtil.of("aaa", null);
+		String jsonStr = JSONUtil.toJsonStr(JSONUtil.parse(aaa,
+				JSONConfig.create().setIgnoreNullValue(false)));
+		Assert.assertEquals("[\"aaa\",null]", jsonStr);
+	}
+
 	@Test
 	public void addTest() {
 		// 方法1
@@ -96,7 +105,7 @@ public class JSONArrayTest {
 
 		List<Exam> list = array.toList(Exam.class);
 		Assert.assertFalse(list.isEmpty());
-		Assert.assertEquals(Exam.class, list.get(0).getClass());
+		Assert.assertSame(Exam.class, list.get(0).getClass());
 	}
 
 	@Test
@@ -107,7 +116,7 @@ public class JSONArrayTest {
 		List<User> userList = JSONUtil.toList(array, User.class);
 		
 		Assert.assertFalse(userList.isEmpty());
-		Assert.assertEquals(User.class, userList.get(0).getClass());
+		Assert.assertSame(User.class, userList.get(0).getClass());
 		
 		Assert.assertEquals(Integer.valueOf(111), userList.get(0).getId());
 		Assert.assertEquals(Integer.valueOf(112), userList.get(1).getId());
@@ -125,7 +134,7 @@ public class JSONArrayTest {
 		List<Dict> list = JSONUtil.toList(array, Dict.class);
 		
 		Assert.assertFalse(list.isEmpty());
-		Assert.assertEquals(Dict.class, list.get(0).getClass());
+		Assert.assertSame(Dict.class, list.get(0).getClass());
 		
 		Assert.assertEquals(Integer.valueOf(111), list.get(0).getInt("id"));
 		Assert.assertEquals(Integer.valueOf(112), list.get(1).getInt("id"));
@@ -142,7 +151,7 @@ public class JSONArrayTest {
 		//noinspection SuspiciousToArrayCall
 		Exam[] list = array.toArray(new Exam[0]);
 		Assert.assertNotEquals(0, list.length);
-		Assert.assertEquals(Exam.class, list[0].getClass());
+		Assert.assertSame(Exam.class, list[0].getClass());
 	}
 
 	/**

hutool-log/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-log</artifactId>
@@ -74,7 +74,7 @@
 		<dependency>
 			<groupId>org.tinylog</groupId>
 			<artifactId>tinylog-api</artifactId>
-			<version>2.1.2</version>
+			<version>2.2.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>

hutool-poi/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-poi</artifactId>

hutool-script/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-script</artifactId>

hutool-setting/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-setting</artifactId>

hutool-socket/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-socket</artifactId>

hutool-system/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>cn.hutool</groupId>
 		<artifactId>hutool-parent</artifactId>
-		<version>5.5.2-SNAPSHOT</version>
+		<version>5.5.3-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>hutool-system</artifactId>
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.github.oshi</groupId>
 			<artifactId>oshi-core</artifactId>
-			<version>5.3.5</version>
+			<version>5.3.6</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

pom.xml

@@ -8,7 +8,7 @@
 
 	<groupId>cn.hutool</groupId>
 	<artifactId>hutool-parent</artifactId>
-	<version>5.5.2-SNAPSHOT</version>
+	<version>5.5.3-SNAPSHOT</version>
 	<name>hutool</name>
 	<description>Hutool是一个小而全的Java工具类库，通过静态方法封装，降低相关API的学习成本，提高工作效率，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。</description>
 	<url>https://github.com/looly/hutool</url>