From 5264d90072751ca2c27a4744188c7eb486afb138 Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Tue, 16 Aug 2022 10:55:21 +0800
Subject: [PATCH] update dependency

---
 hutool-db/pom.xml                                     |  8 ++++----
 hutool-extra/pom.xml                                  | 11 ++++++-----
 .../cn/hutool/extra/management/ManagementUtil.java    |  4 ++--
 .../template/engine/velocity/VelocityEngine.java      |  3 ++-
 hutool-log/pom.xml                                    |  3 ++-
 hutool-poi/pom.xml                                    |  2 +-
 .../src/main/java/cn/hutool/setting/AbsSetting.java   |  2 +-
 pom.xml                                               |  2 +-
 8 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 0d2403b0a..51b59e074 100755
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -23,7 +23,7 @@
 		<tomcat-jdbc.version>10.0.20</tomcat-jdbc.version>
 		<druid.version>1.2.11</druid.version>
 		<hikariCP.version>4.0.3</hikariCP.version>
-		<sqlite.version>3.36.0.3</sqlite.version>
+		<sqlite.version>3.39.2.0</sqlite.version>
 		<!-- 此处固定2.5.x，支持到JDK8 -->
 		<hsqldb.version>2.5.2</hsqldb.version>
 	</properties>
@@ -79,7 +79,7 @@
 		<dependency>
 			<groupId>com.github.chris2018998</groupId>
 			<artifactId>beecp</artifactId>
-			<version>3.3.6</version>
+			<version>3.3.8</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-api</artifactId>
@@ -117,7 +117,7 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>8.0.29</version>
+			<version>8.0.30</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -141,7 +141,7 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>2.1.212</version>
+			<version>2.1.214</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index e0978a0c7..51e42bd62 100755
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -26,12 +26,12 @@
 		<thymeleaf.version>3.0.15.RELEASE</thymeleaf.version>
 		<mail.version>1.6.2</mail.version>
 		<jsch.version>0.1.55</jsch.version>
-		<sshj.version>0.33.0</sshj.version>
+		<sshj.version>0.34.0</sshj.version>
 		<zxing.version>3.5.0</zxing.version>
 		<net.version>3.8.0</net.version>
 		<emoji-java.version>5.1.1</emoji-java.version>
 		<servlet-api.version>4.0.1</servlet-api.version>
-		<spring-boot.version>2.6.7</spring-boot.version>
+		<spring-boot.version>2.7.2</spring-boot.version>
 		<cglib.version>3.3.0</cglib.version>
 	</properties>
 
@@ -61,6 +61,7 @@
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
 			<artifactId>jakarta.servlet-api</artifactId>
+			<!-- 版本固定5.0.0，可以支持jdk8 -->
 			<version>5.0.0</version>
 			<scope>provided</scope>
 			<optional>true</optional>
@@ -273,7 +274,7 @@
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers-smartcn</artifactId>
-			<version>8.11.1</version>
+			<version>8.11.2</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -464,7 +465,7 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>5.3.20</version>
+			<version>5.3.22</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
@@ -487,7 +488,7 @@
 		<dependency>
 			<groupId>com.github.oshi</groupId>
 			<artifactId>oshi-core</artifactId>
-			<version>6.1.6</version>
+			<version>6.2.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java
index 0b57d3682..39415df28 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java
@@ -2,7 +2,7 @@ package cn.hutool.extra.management;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Singleton;
-import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.util.ObjUtil;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -446,6 +446,6 @@ public class ManagementUtil {
 	 * @param value   值
 	 */
 	protected static void append(final StringBuilder builder, final String caption, final Object value) {
-		builder.append(caption).append(StrUtil.nullToDefault(Convert.toStr(value), "[n/a]")).append("\n");
+		builder.append(caption).append(ObjUtil.defaultIfNull(Convert.toStr(value), "[n/a]")).append("\n");
 	}
 }
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
index d2700f001..77b39f7b2 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
@@ -1,6 +1,7 @@
 package cn.hutool.extra.template.engine.velocity;
 
 import cn.hutool.core.text.StrUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
@@ -134,7 +135,7 @@ public class VelocityEngine implements TemplateEngine {
 			case WEB_ROOT:
 				ve.setProperty(Velocity.RESOURCE_LOADER, "webapp");
 				ve.setProperty("webapp.resource.loader.class", "org.apache.velocity.tools.view.servlet.WebappLoader");
-				ve.setProperty("webapp.resource.loader.path", StrUtil.nullToDefault(config.getPath(), StrUtil.SLASH));
+				ve.setProperty("webapp.resource.loader.path", ObjUtil.defaultIfNull(config.getPath(), StrUtil.SLASH));
 				break;
 			case STRING:
 				ve.setProperty(Velocity.RESOURCE_LOADER, "str");
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index d057945a4..442a7697a 100755
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -21,9 +21,10 @@
 		<slf4j.version>1.7.36</slf4j.version>
 		<logback.version>1.3.0-alpha5</logback.version>
 		<log4j.version>1.2.17</log4j.version>
-		<log4j2.version>2.17.2</log4j2.version>
+		<log4j2.version>2.18.0</log4j2.version>
 		<commons-logging.version>1.2</commons-logging.version>
 		<tinylog.version>1.3.6</tinylog.version>
+		<!-- 固定3.4.x，支持到jdk8 -->
 		<jboss-logging.version>3.4.3.Final</jboss-logging.version>
 		<logtube.version>0.43.2</logtube.version>
 	</properties>
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index d938e057d..36620d26a 100755
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>org.ofdrw</groupId>
 			<artifactId>ofdrw-full</artifactId>
-			<version>1.17.14</version>
+			<version>1.18.2</version>
 			<scope>compile</scope>
 			<optional>true</optional>
 		</dependency>
diff --git a/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java b/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
index 14420bdbe..617aa2119 100644
--- a/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
+++ b/hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
@@ -61,7 +61,7 @@ public abstract class AbsSetting implements OptNullBasicTypeFromStringGetter<Str
 	 */
 	public String getStrNotEmpty(final String key, final String group, final String defaultValue) {
 		final String value = getByGroup(key, group);
-		return ObjUtil.defaultIfEmpty(value, defaultValue);
+		return StrUtil.defaultIfEmpty(value, defaultValue);
 	}
 
 	/**
diff --git a/pom.xml b/pom.xml
index 194569a65..408ceac61 100755
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 
 		<!-- versions -->
 		<compile.version>8</compile.version>
-		<junit.version>5.8.2</junit.version>
+		<junit.version>5.9.0</junit.version>
 		<lombok.version>1.18.24</lombok.version>
 	</properties>