ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update dependency

Browse Source
This commit is contained in:
Looly 2022-08-16 10:55:21 +08:00
parent 1ca70d893d
commit 5264d90072
8 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-db/pom.xml
View File

@ -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>

11
hutool-extra/pom.xml
View File

@ -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>

4
hutool-extra/src/main/java/cn/hutool/extra/management/ManagementUtil.java
View File

@ -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");
}
}

3
hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
View File

@ -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");

3
hutool-log/pom.xml
View File

@ -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>

2
hutool-poi/pom.xml
View File

@ -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>

2
hutool-setting/src/main/java/cn/hutool/setting/AbsSetting.java
View File

@ -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);
}
/**

2
pom.xml
View File

@ -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>