From e52a282717a9bb5c515dc22d3dfc7c624637d97d Mon Sep 17 00:00:00 2001
From: Looly <loolly@gmail.com>
Date: Fri, 11 Oct 2019 17:52:23 +0800
Subject: [PATCH] update dependency

---
 hutool-crypto/pom.xml                         |  2 +-
 hutool-db/pom.xml                             | 20 ++++++++---------
 hutool-extra/pom.xml                          | 22 +++++++++----------
 hutool-log/pom.xml                            |  8 +++----
 hutool-poi/pom.xml                            |  2 +-
 .../cn/hutool/poi/excel/ExcelPicUtil.java     |  2 +-
 hutool-setting/pom.xml                        |  6 -----
 hutool-system/pom.xml                         |  2 +-
 pom.xml                                       |  5 +++--
 9 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/hutool-crypto/pom.xml b/hutool-crypto/pom.xml
index f18caf644..856b34c10 100644
--- a/hutool-crypto/pom.xml
+++ b/hutool-crypto/pom.xml
@@ -18,7 +18,7 @@
 
 	<properties>
 		<!-- versions -->
-		<bouncycastle.version>1.60</bouncycastle.version>
+		<bouncycastle.version>1.64</bouncycastle.version>
 	</properties>
 
 	<dependencies>
diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml
index 8dbc7ef7e..659892b5f 100644
--- a/hutool-db/pom.xml
+++ b/hutool-db/pom.xml
@@ -19,14 +19,14 @@
 	<properties>
 		<!-- versions -->
 		<c3p0.version>0.9.5.4</c3p0.version>
-		<dbcp2.version>2.4.0</dbcp2.version>
-		<tomcat-jdbc.version>8.5.35</tomcat-jdbc.version>
-		<druid.version>1.1.12</druid.version>
+		<dbcp2.version>2.7.0</dbcp2.version>
+		<tomcat-jdbc.version>9.0.27</tomcat-jdbc.version>
+		<druid.version>1.1.20</druid.version>
 		<hikariCP.version>2.4.13</hikariCP.version>
-		<mongo.version>3.8.2</mongo.version>
-		<sqlite.version>3.21.0.1</sqlite.version>
-		<hsqldb.version>2.3.6</hsqldb.version>
-		<jedis.version>3.0.1</jedis.version>
+		<mongo.version>3.11.0</mongo.version>
+		<sqlite.version>3.28.0</sqlite.version>
+		<hsqldb.version>2.5.0</hsqldb.version>
+		<jedis.version>3.1.0</jedis.version>
 	</properties>
 
 	<dependencies>
@@ -114,19 +114,19 @@
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.41</version>
+			<version>8.0.17</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.2.5.jre7</version>
+			<version>42.2.8.jre7</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.microsoft.sqlserver</groupId>
 			<artifactId>mssql-jdbc</artifactId>
-			<version>6.4.0.jre7</version>
+			<version>7.4.1.jre8</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/hutool-extra/pom.xml b/hutool-extra/pom.xml
index a490d1ef8..dcb3229fd 100644
--- a/hutool-extra/pom.xml
+++ b/hutool-extra/pom.xml
@@ -19,17 +19,17 @@
 	<properties>
 		<!-- versions -->
 		<velocity.version>2.0</velocity.version>
-		<beetl.version>2.9.8</beetl.version>
+		<beetl.version>3.0.13.RELEASE</beetl.version>
 		<rythm.version>1.3.0</rythm.version>
-		<freemarker.version>2.3.28</freemarker.version>
-		<enjoy.version>3.4</enjoy.version>
+		<freemarker.version>2.3.29</freemarker.version>
+		<enjoy.version>4.5</enjoy.version>
 		<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
 		<mail.version>1.6.2</mail.version>
 		<jsch.version>0.1.55</jsch.version>
-		<zxing.version>3.3.3</zxing.version>
+		<zxing.version>3.4.0</zxing.version>
 		<net.version>3.6</net.version>
-		<emoji-java.version>4.0.0</emoji-java.version>
-		<servlet-api.version>3.1.0</servlet-api.version>
+		<emoji-java.version>5.1.1</emoji-java.version>
+		<servlet-api.version>4.0.1</servlet-api.version>
 	</properties>
 
 	<dependencies>
@@ -153,7 +153,7 @@
 		<dependency>
 			<groupId>org.lionsoul</groupId>
 			<artifactId>jcseg-core</artifactId>
-			<version>2.0.1</version>
+			<version>2.5.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -185,25 +185,25 @@
 		<dependency>
 			<groupId>com.hankcs</groupId>
 			<artifactId>hanlp</artifactId>
-			<version>portable-1.7.2</version>
+			<version>portable-1.7.4</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.lucene</groupId>
 			<artifactId>lucene-analyzers-smartcn</artifactId>
-			<version>5.5.5</version>
+			<version>8.2.0</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apdplat</groupId>
 			<artifactId>word</artifactId>
-			<version>1.2</version>
+			<version>1.3.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.mayabot.mynlp</groupId>
 			<artifactId>mynlp-segment</artifactId>
-			<version>3.0.0</version>
+			<version>3.0.2</version>
 			<optional>true</optional>
 		</dependency>
 	</dependencies>
diff --git a/hutool-log/pom.xml b/hutool-log/pom.xml
index 5b93edafc..0374654f8 100644
--- a/hutool-log/pom.xml
+++ b/hutool-log/pom.xml
@@ -19,12 +19,12 @@
 	<properties>
 		<!-- versions -->
 		<slf4j.version>1.7.26</slf4j.version>
-		<logback.version>1.2.3</logback.version>
+		<logback.version>1.3.0-alpha4</logback.version>
 		<log4j.version>1.2.17</log4j.version>
-		<log4j2.version>2.11.2</log4j2.version>
+		<log4j2.version>2.12.1</log4j2.version>
 		<commons-logging.version>1.2</commons-logging.version>
-		<tinylog.version>1.3.5</tinylog.version>
-		<jboss-logging.version>3.3.2.Final</jboss-logging.version>
+		<tinylog.version>1.3.6</tinylog.version>
+		<jboss-logging.version>3.4.1.Final</jboss-logging.version>
 	</properties>
 
 	<dependencies>
diff --git a/hutool-poi/pom.xml b/hutool-poi/pom.xml
index 1f9758f72..2733166cf 100644
--- a/hutool-poi/pom.xml
+++ b/hutool-poi/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<!-- versions -->
-		<poi.version>3.17</poi.version>
+		<poi.version>4.1.0</poi.version>
 		<xerces.version>2.12.0</xerces.version>
 	</properties>
 
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
index c0f7d5e2d..a5000445f 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
@@ -4,13 +4,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.poi.POIXMLDocumentPart;
 import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
 import org.apache.poi.hssf.usermodel.HSSFPicture;
 import org.apache.poi.hssf.usermodel.HSSFPictureData;
 import org.apache.poi.hssf.usermodel.HSSFShape;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFDrawing;
diff --git a/hutool-setting/pom.xml b/hutool-setting/pom.xml
index 4108ff87b..6d84bb0e1 100644
--- a/hutool-setting/pom.xml
+++ b/hutool-setting/pom.xml
@@ -27,11 +27,5 @@
 			<artifactId>hutool-log</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.6</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/hutool-system/pom.xml b/hutool-system/pom.xml
index 06b57231f..1937cc0be 100644
--- a/hutool-system/pom.xml
+++ b/hutool-system/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>com.github.oshi</groupId>
 			<artifactId>oshi-core</artifactId>
-			<version>3.13.3</version>
+			<version>4.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/pom.xml b/pom.xml
index ba6b46479..8bc79ddda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,8 @@
 
 		<!-- versions -->
 		<compile.version>8</compile.version>
-		<junit.version>4.12</junit.version>
+		<junit.version>4.13-beta-3</junit.version>
+		<lombok.version>1.18.10</lombok.version>
 	</properties>
 
 	<dependencies>
@@ -56,7 +57,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.6</version>
+			<version>${lombok.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>