From d83f0ed9c51827e93e88d5eb9930bf441aaec611 Mon Sep 17 00:00:00 2001
From: "Yong.Teng" <webmaster@buession.com>
Date: Wed, 28 Apr 2021 13:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96=E5=8C=85?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 128 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 71 insertions(+), 57 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60473ba..ac69e17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<artifactId>parent</artifactId>
 	<url>https://github.com/buession/buession-parent</url>
 	<description>Buession Parent</description>
-	<version>1.2.0</version>
+	<version>1.2.1</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -41,35 +41,35 @@
 		<project.java.version>1.8</project.java.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
   		<maven.compiler.target>1.8</maven.compiler.target>
-		<buession.version>1.2.0</buession.version>
-		<buession.security.version>1.2.0</buession.security.version>
-		<buession.springboot.version>1.2.0</buession.springboot.version>
-		<buession.springcloud.version>1.2.0</buession.springcloud.version>
-		<springframework.version>5.2.7.RELEASE</springframework.version>
-		<springframework.boot.version>2.3.2.RELEASE</springframework.boot.version>
-		<springframework.cloud.version>2.2.3.RELEASE</springframework.cloud.version>
-		<springframework.security.version>5.3.3.RELEASE</springframework.security.version>
+		<buession.version>1.2.1</buession.version>
+		<buession.security.version>1.2.1</buession.security.version>
+		<buession.springboot.version>1.2.1</buession.springboot.version>
+		<buession.springcloud.version>1.2.1</buession.springcloud.version>
+		<springframework.version>5.2.13.RELEASE</springframework.version>
+		<springframework.boot.version>2.3.9.RELEASE</springframework.boot.version>
+		<springframework.cloud.version>2.2.7.RELEASE</springframework.cloud.version>
+		<springframework.security.version>5.3.8.RELEASE</springframework.security.version>
 		<springframework.webflow.version>2.5.1.RELEASE</springframework.webflow.version>
 		<commons.attributes.version>2.2</commons.attributes.version>
-		<mongodb.version>4.0.5</mongodb.version>
-		<shiro.version>1.5.3</shiro.version>
-		<pac4j.version>4.0.2</pac4j.version>
+		<mongodb.version>4.2.2</mongodb.version>
+		<shiro.version>1.7.1</shiro.version>
+		<pac4j.version>4.4.0</pac4j.version>
 		<cas.client.version>3.6.1</cas.client.version>
-		<velocity.tools.version>3.0</velocity.tools.version>
+		<velocity.tools.version>3.1</velocity.tools.version>
 		<sun.jersey.version>1.19.4</sun.jersey.version>
-		<fasterxml.jackson.core.version>2.11.0</fasterxml.jackson.core.version>
-		<fasterxml.jackson.dataformat.version>2.11.0</fasterxml.jackson.dataformat.version>
-		<fasterxml.jackson.datatype.version>2.11.0</fasterxml.jackson.datatype.version>
-		<fasterxml.jackson.jaxrs.version>2.11.0</fasterxml.jackson.jaxrs.version>
-		<fasterxml.jackson.module.version>2.11.0</fasterxml.jackson.module.version>
+		<fasterxml.jackson.core.version>2.12.2</fasterxml.jackson.core.version>
+		<fasterxml.jackson.dataformat.version>2.12.2</fasterxml.jackson.dataformat.version>
+		<fasterxml.jackson.datatype.version>2.12.2</fasterxml.jackson.datatype.version>
+		<fasterxml.jackson.jaxrs.version>2.12.2</fasterxml.jackson.jaxrs.version>
+		<fasterxml.jackson.module.version>2.12.2</fasterxml.jackson.module.version>
 		<codehaus.jackson.version>1.9.13</codehaus.jackson.version>
 		<codehaus.jettison.version>1.4.0</codehaus.jettison.version>
-		<io.micrometer.version>1.5.3</io.micrometer.version>
-		<io.dropwizard.metrics.version>4.1.9</io.dropwizard.metrics.version>
-		<aspectj.version>1.9.5</aspectj.version>
-		<org.bouncycastle.version>1.65</org.bouncycastle.version>
+		<io.micrometer.version>1.6.5</io.micrometer.version>
+		<io.dropwizard.metrics.version>4.1.18</io.dropwizard.metrics.version>
+		<aspectj.version>1.9.6</aspectj.version>
+		<org.bouncycastle.version>1.68</org.bouncycastle.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<apache.logging.log4j.version>2.13.3</apache.logging.log4j.version>
+		<apache.logging.log4j.version>2.14.1</apache.logging.log4j.version>
 	</properties>
 
 	<dependencyManagement>
@@ -288,25 +288,25 @@
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-commons</artifactId>
-				<version>2.3.1.RELEASE</version>
+				<version>2.3.8.RELEASE</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-mongodb</artifactId>
-				<version>3.0.1.RELEASE</version>
+				<version>3.0.8.RELEASE</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-redis</artifactId>
-				<version>2.3.1.RELEASE</version>
+				<version>2.3.8.RELEASE</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.session</groupId>
 				<artifactId>spring-session-data-redis</artifactId>
-				<version>2.3.0.RELEASE</version>
+				<version>2.3.2.RELEASE</version>
 				<scope>compile</scope>
 			</dependency>
 
@@ -324,7 +324,7 @@
 			<dependency>
 				<groupId>org.springframework.security</groupId>
 				<artifactId>spring-security-rsa</artifactId>
-				<version>1.0.9.RELEASE</version>
+				<version>1.0.10.RELEASE</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.security</groupId>
@@ -364,7 +364,7 @@
 			<dependency>
 				<groupId>org.springframework.retry</groupId>
 				<artifactId>spring-retry</artifactId>
-				<version>1.3.0</version>
+				<version>1.3.1</version>
 				<exclusions>
 					<exclusion>
 						<groupId>javax.annotation</groupId>
@@ -456,20 +456,20 @@
 			<dependency>
 		      	<groupId>com.zaxxer</groupId>
 		      	<artifactId>HikariCP</artifactId>
-		      	<version>3.4.5</version>
+		      	<version>4.0.3</version>
       			<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis</artifactId>
-				<version>3.5.5</version>
+				<version>3.5.6</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis-spring</artifactId>
-				<version>2.0.5</version>
+				<version>2.0.6</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -495,7 +495,7 @@
 			<dependency>
 				<groupId>org.apache.velocity</groupId>
 				<artifactId>velocity-engine-core</artifactId>
-				<version>2.2</version>
+				<version>2.3</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.velocity.tools</groupId>
@@ -540,7 +540,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>29.0-jre</version>
+				<version>30.1.1-jre</version>
 				<exclusions>
 					<exclusion>
 						<groupId>com.google.guava</groupId>
@@ -557,7 +557,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
-				<version>3.10</version>
+				<version>3.12.0</version>
 			</dependency>
 			<dependency>
     			<groupId>org.apache.commons</groupId>
@@ -567,7 +567,7 @@
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-pool2</artifactId>
-				<version>2.8.1</version>
+				<version>2.9.0</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -579,17 +579,17 @@
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpcore</artifactId>
-				<version>4.4.13</version>
+				<version>4.4.14</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
-				<version>4.5.12</version>
+				<version>4.5.13</version>
 			</dependency>
 			<dependency>
 			    <groupId>org.apache.httpcomponents</groupId>
 			    <artifactId>httpmime</artifactId>
-			    <version>4.5.12</version>
+			    <version>4.5.13</version>
 			</dependency>
 
 			<dependency>
@@ -610,7 +610,7 @@
 			<dependency>
 				<groupId>commons-codec</groupId>
 				<artifactId>commons-codec</artifactId>
-				<version>1.14</version>
+				<version>1.15</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-collections</groupId>
@@ -625,7 +625,7 @@
 			<dependency>
 				<groupId>commons-io</groupId>
 				<artifactId>commons-io</artifactId>
-				<version>2.7</version>
+				<version>2.8.0</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-lang</groupId>
@@ -641,7 +641,7 @@
 			<dependency>
 				<groupId>commons-validator</groupId>
 				<artifactId>commons-validator</artifactId>
-				<version>1.6</version>
+				<version>1.7</version>
 			</dependency>
 
 			<dependency>
@@ -659,20 +659,20 @@
 			<dependency>
 			    <groupId>redis.clients</groupId>
 			    <artifactId>jedis</artifactId>
-			    <version>3.3.0</version>
+			    <version>3.5.2</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
     			<groupId>io.lettuce</groupId>
     			<artifactId>lettuce-core</artifactId>
-    			<version>5.3.1.RELEASE</version>
+    			<version>5.3.6.RELEASE</version>
 				<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>
-				<version>2.10.6</version>
+				<version>2.10.10</version>
 			</dependency>
 			<dependency>
     			<groupId>com.fasterxml</groupId>
@@ -687,7 +687,7 @@
 			<dependency>
     			<groupId>org.checkerframework</groupId>
     			<artifactId>checker-qual</artifactId>
-    			<version>3.4.1</version>
+    			<version>3.12.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>cglib</groupId>
@@ -718,7 +718,7 @@
 			<dependency>
 			    <groupId>org.hibernate</groupId>
 			    <artifactId>hibernate-core</artifactId>
-			    <version>5.4.18.Final</version>
+			    <version>5.4.30.Final</version>
 			    <exclusions>
 					<exclusion>
 						<groupId>org.jboss.logging</groupId>
@@ -745,7 +745,7 @@
 			<dependency>
 			    <groupId>org.hibernate.validator</groupId>
 			    <artifactId>hibernate-validator</artifactId>
-			    <version>6.1.5.Final</version>
+			    <version>6.2.0.Final</version>
 			</dependency>
 
 			<dependency>
@@ -784,7 +784,7 @@
 			<dependency>
 				<groupId>com.squareup.okhttp3</groupId>
 				<artifactId>okhttp</artifactId>
-				<version>4.7.2</version>
+				<version>4.9.1</version>
 				<scope>compile</scope>
 			</dependency>
 
@@ -925,7 +925,7 @@
 			<dependency>
 				<groupId>io.projectreactor</groupId>
 				<artifactId>reactor-core</artifactId>
-				<version>3.3.6.RELEASE</version>
+				<version>3.3.15.RELEASE</version>
 			</dependency>
 
 			<!-- shiro start -->
@@ -993,7 +993,7 @@
 			<dependency>
 				<groupId>org.yaml</groupId>
 				<artifactId>snakeyaml</artifactId>
-				<version>1.26</version>
+				<version>1.28</version>
 			</dependency>
 
 			<dependency>
@@ -1051,6 +1051,11 @@
 				<artifactId>jackson-dataformat-cbor</artifactId>
 				<version>${fasterxml.jackson.dataformat.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.dataformat</groupId>
+				<artifactId>jackson-dataformat-properties</artifactId>
+				<version>${fasterxml.jackson.dataformat.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.dataformat</groupId>
 				<artifactId>jackson-dataformat-smile</artifactId>
@@ -1094,6 +1099,11 @@
 				<artifactId>jackson-module-parameter-names</artifactId>
 				<version>${fasterxml.jackson.module.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.fasterxml.jackson.module</groupId>
+				<artifactId>jackson-module-kotlin</artifactId>
+				<version>${fasterxml.jackson.module.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.module</groupId>
 				<artifactId>jackson-module-afterburner</artifactId>
@@ -1132,7 +1142,7 @@
 			<dependency>
 			    <groupId>com.alibaba</groupId>
 			    <artifactId>fastjson</artifactId>
-			    <version>1.2.73</version>
+			    <version>1.2.75</version>
 			</dependency>
 
 			<dependency>
@@ -1181,6 +1191,11 @@
 				<artifactId>log4j-jul</artifactId>
 				<version>${apache.logging.log4j.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-to-slf4j</artifactId>
+				<version>${apache.logging.log4j.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-slf4j-impl</artifactId>
@@ -1201,7 +1216,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.13</version>
+				<version>4.13.2</version>
 				<scope>test</scope>
 			</dependency>
 		</dependencies>
@@ -1260,15 +1275,14 @@
 						<encoding>${project.build.encoding}</encoding>
 						<docencoding>${project.build.encoding}</docencoding>
 						<reportOutputDirectory>${basedir}/../docs/doc/${project.version}/</reportOutputDirectory>
-						<destDir>${project.artifactId}</destDir>
+						<destDir>${basedir}/../docs/doc/${project.version}/${project.artifactId}</destDir>
 					</configuration>
 					<executions>
 						<execution>
-							<id>aggregate</id>
+							<id>attach-javadoc</id>
 							<goals>
-								<goal>aggregate</goal>
+								<goal>jar</goal>
 							</goals>
-							<phase>site</phase>
 						</execution>
 					</executions>
 				</plugin>