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 @@
10.0.20
1.2.11
4.0.3
- 3.36.0.3
+ 3.39.2.0
2.5.2
@@ -79,7 +79,7 @@
com.github.chris2018998
beecp
- 3.3.6
+ 3.3.8
slf4j-api
@@ -117,7 +117,7 @@
mysql
mysql-connector-java
- 8.0.29
+ 8.0.30
test
@@ -141,7 +141,7 @@
com.h2database
h2
- 2.1.212
+ 2.1.214
test
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 @@
3.0.15.RELEASE
1.6.2
0.1.55
- 0.33.0
+ 0.34.0
3.5.0
3.8.0
5.1.1
4.0.1
- 2.6.7
+ 2.7.2
3.3.0
@@ -61,6 +61,7 @@
jakarta.servlet
jakarta.servlet-api
+
5.0.0
provided
true
@@ -273,7 +274,7 @@
org.apache.lucene
lucene-analyzers-smartcn
- 8.11.1
+ 8.11.2
true
@@ -464,7 +465,7 @@
org.springframework
spring-expression
- 5.3.20
+ 5.3.22
compile
true
@@ -487,7 +488,7 @@
com.github.oshi
oshi-core
- 6.1.6
+ 6.2.2
provided
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 @@
1.7.36
1.3.0-alpha5
1.2.17
- 2.17.2
+ 2.18.0
1.2
1.3.6
+
3.4.3.Final
0.43.2
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 @@
org.ofdrw
ofdrw-full
- 1.17.14
+ 1.18.2
compile
true
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
8
- 5.8.2
+ 5.9.0
1.18.24