From d75b254dc5f4f68c1c10035050ce5d57c920847b Mon Sep 17 00:00:00 2001
From: eduosi <webmaster@buession.com>
Date: Sat, 11 Apr 2020 23:54:24 +0800
Subject: [PATCH] upgrade 1.1.2

---
 pom.xml | 263 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 177 insertions(+), 86 deletions(-)

diff --git a/pom.xml b/pom.xml
index d4cb081..ba10564 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.1.0</version>
+	<version>1.1.2</version>
 	<packaging>pom</packaging>
 
 	<organization>
@@ -39,32 +39,35 @@
 	<properties>
 		<project.build.encoding>UTF-8</project.build.encoding>
 		<project.java.version>1.8</project.java.version>
-		<buession.version>1.1.0</buession.version>
-		<buession.security.version>1.1.0</buession.security.version>
-		<buession.springboot.version>1.1.0</buession.springboot.version>
-		<buession.springcloud.version>1.1.0</buession.springcloud.version>
-		<springframework.version>5.2.1.RELEASE</springframework.version>
-		<springframework.boot.version>2.2.1.RELEASE</springframework.boot.version>
-		<springframework.cloud.version>2.2.0.RELEASE</springframework.cloud.version>
-		<springframework.data.version>2.2.2.RELEASE</springframework.data.version>
-		<springframework.security.version>5.2.1.RELEASE</springframework.security.version>
+		<buession.version>1.1.2</buession.version>
+		<buession.security.version>1.1.2</buession.security.version>
+		<buession.springboot.version>1.1.2</buession.springboot.version>
+		<buession.springcloud.version>1.1.2</buession.springcloud.version>
+		<springframework.version>5.2.5.RELEASE</springframework.version>
+		<springframework.boot.version>2.2.6.RELEASE</springframework.boot.version>
+		<springframework.cloud.version>2.2.2.RELEASE</springframework.cloud.version>
+		<springframework.data.version>2.2.6.RELEASE</springframework.data.version>
+		<springframework.security.version>5.3.0.RELEASE</springframework.security.version>
 		<springframework.webflow.version>2.5.1.RELEASE</springframework.webflow.version>
 		<commons.attributes.version>2.2</commons.attributes.version>
+		<shiro.version>1.5.2</shiro.version>
+		<pac4j.version>4.0.0-RC3</pac4j.version>
+		<cas.client.version>3.6.1</cas.client.version>
 		<velocity.tools.version>3.0</velocity.tools.version>
 		<sun.jersey.version>1.19.4</sun.jersey.version>
-		<fasterxml.jackson.core.version>2.10.1</fasterxml.jackson.core.version>
-		<fasterxml.jackson.dataformat.version>2.10.1</fasterxml.jackson.dataformat.version>
-		<fasterxml.jackson.datatype.version>2.10.1</fasterxml.jackson.datatype.version>
-		<fasterxml.jackson.jaxrs.version>2.10.1</fasterxml.jackson.jaxrs.version>
-		<fasterxml.jackson.module.version>2.10.1</fasterxml.jackson.module.version>
+		<fasterxml.jackson.core.version>2.10.3</fasterxml.jackson.core.version>
+		<fasterxml.jackson.dataformat.version>2.10.3</fasterxml.jackson.dataformat.version>
+		<fasterxml.jackson.datatype.version>2.10.3</fasterxml.jackson.datatype.version>
+		<fasterxml.jackson.jaxrs.version>2.10.3</fasterxml.jackson.jaxrs.version>
+		<fasterxml.jackson.module.version>2.10.3</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.3.1</io.micrometer.version>
-		<io.dropwizard.metrics.version>4.1.1</io.dropwizard.metrics.version>
+		<io.micrometer.version>1.3.6</io.micrometer.version>
+		<io.dropwizard.metrics.version>4.1.5</io.dropwizard.metrics.version>
 		<aspectj.version>1.9.5</aspectj.version>
 		<org.bouncycastle.version>1.64</org.bouncycastle.version>
-		<slf4j.version>1.7.26</slf4j.version>
-		<apache.logging.log4j.version>2.11.2</apache.logging.log4j.version>
+		<slf4j.version>1.7.30</slf4j.version>
+		<apache.logging.log4j.version>2.13.1</apache.logging.log4j.version>
 	</properties>
 
 	<dependencyManagement>
@@ -278,7 +281,7 @@
 			<dependency>
 				<groupId>org.springframework.session</groupId>
 				<artifactId>spring-session-data-redis</artifactId>
-				<version>2.2.0.RELEASE</version>
+				<version>2.2.2.RELEASE</version>
 				<scope>compile</scope>
 			</dependency>
 
@@ -296,7 +299,7 @@
 			<dependency>
 				<groupId>org.springframework.security</groupId>
 				<artifactId>spring-security-rsa</artifactId>
-				<version>1.0.8.RELEASE</version>
+				<version>1.0.9.RELEASE</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.security</groupId>
@@ -334,51 +337,15 @@
 			</dependency>
 
 			<dependency>
-				<groupId>javax.servlet</groupId>
-				<artifactId>javax.servlet-api</artifactId>
-				<version>4.0.1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-    			<groupId>javax.annotation</groupId>
-    			<artifactId>javax.annotation-api</artifactId>
-    			<version>1.3.2</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.transaction</groupId>
-				<artifactId>javax.transaction-api</artifactId>
-				<version>1.3</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-			  	<groupId>javax.transaction</groupId>
-			  	<artifactId>jta</artifactId>
-			  	<version>1.1</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.persistence</groupId>
-				<artifactId>javax.persistence-api</artifactId>
-				<version>2.2</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.glassfish</groupId>
-				<artifactId>javax.el</artifactId>
-				<version>3.0.0</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>javax.validation</groupId>
-				<artifactId>validation-api</artifactId>
-				<version>2.0.1.Final</version>
+				<groupId>org.springframework.retry</groupId>
+				<artifactId>spring-retry</artifactId>
+				<version>1.2.5.RELEASE</version>
 			</dependency>
 
 			<dependency>
 			    <groupId>jakarta.activation</groupId>
 			    <artifactId>jakarta.activation-api</artifactId>
-			    <version>1.2.1</version>
+			    <version>1.2.2</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -408,7 +375,7 @@
 			<dependency>
 			    <groupId>jakarta.jws</groupId>
 			    <artifactId>jakarta.jws-api</artifactId>
-			    <version>1.1.1</version>
+			    <version>2.1.0</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -438,7 +405,7 @@
 			<dependency>
 				<groupId>jakarta.xml.ws</groupId>
 				<artifactId>jakarta.xml.ws-api</artifactId>
-				<version>2.3.2</version>
+				<version>2.3.3</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -458,20 +425,20 @@
 			<dependency>
 		      	<groupId>com.zaxxer</groupId>
 		      	<artifactId>HikariCP</artifactId>
-		      	<version>3.4.1</version>
+		      	<version>3.4.2</version>
       			<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis</artifactId>
-				<version>3.5.3</version>
+				<version>3.5.4</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.mybatis</groupId>
 				<artifactId>mybatis-spring</artifactId>
-				<version>2.0.3</version>
+				<version>2.0.4</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -490,14 +457,14 @@
 			<dependency>
 				<groupId>org.mongodb</groupId>
 				<artifactId>mongo-java-driver</artifactId>
-				<version>3.11.2</version>
+				<version>3.12.2</version>
 			</dependency>
 
 			<!-- velocity start -->
 			<dependency>
 				<groupId>org.apache.velocity</groupId>
 				<artifactId>velocity-engine-core</artifactId>
-				<version>2.1</version>
+				<version>2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.velocity.tools</groupId>
@@ -542,7 +509,7 @@
 			<dependency>
 				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
-				<version>28.1-jre</version>
+				<version>28.2-jre</version>
 				<exclusions>
 					<exclusion>
 						<groupId>com.google.guava</groupId>
@@ -561,10 +528,15 @@
 				<artifactId>commons-lang3</artifactId>
 				<version>3.9</version>
 			</dependency>
+			<dependency>
+    			<groupId>org.apache.commons</groupId>
+    			<artifactId>commons-collections4</artifactId>
+    			<version>4.4</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-pool2</artifactId>
-				<version>2.7.0</version>
+				<version>2.8.0</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
@@ -572,15 +544,16 @@
 			    <artifactId>commons-digester3</artifactId>
 			    <version>3.2</version>
 			</dependency>
+
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpcore</artifactId>
-				<version>4.4.12</version>
+				<version>4.4.13</version>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
-				<version>4.5.10</version>
+				<version>4.5.12</version>
 			</dependency>
 
 			<dependency>
@@ -601,7 +574,7 @@
 			<dependency>
 				<groupId>commons-codec</groupId>
 				<artifactId>commons-codec</artifactId>
-				<version>1.13</version>
+				<version>1.14</version>
 			</dependency>
 			<dependency>
 				<groupId>commons-collections</groupId>
@@ -650,14 +623,14 @@
 			<dependency>
 			    <groupId>redis.clients</groupId>
 			    <artifactId>jedis</artifactId>
-			    <version>3.1.0</version>
+			    <version>3.2.0</version>
 				<scope>compile</scope>
 			</dependency>
 
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time</artifactId>
-				<version>2.10.2</version>
+				<version>2.10.5</version>
 			</dependency>
 			<dependency>
     			<groupId>com.fasterxml</groupId>
@@ -672,7 +645,7 @@
 			<dependency>
     			<groupId>org.checkerframework</groupId>
     			<artifactId>checker-qual</artifactId>
-    			<version>3.0.0</version>
+    			<version>3.2.0</version>
 			</dependency>
 			<dependency>
 			    <groupId>cglib</groupId>
@@ -703,12 +676,34 @@
 			<dependency>
 			    <groupId>org.hibernate</groupId>
 			    <artifactId>hibernate-core</artifactId>
-			    <version>5.4.8.Final</version>
+			    <version>5.4.13.Final</version>
+			    <exclusions>
+					<exclusion>
+						<groupId>org.jboss.logging</groupId>
+						<artifactId>jboss-logging</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.jboss.spec.javax.transaction</groupId>
+						<artifactId>jboss-transaction-api_1.2_spec</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.persistence</groupId>
+						<artifactId>javax.persistence-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.activation</groupId>
+						<artifactId>javax.activation-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>javax.xml.bind</groupId>
+						<artifactId>jaxb-api</artifactId>
+					</exclusion>
+			    </exclusions>
 			</dependency>
 			<dependency>
 			    <groupId>org.hibernate.validator</groupId>
 			    <artifactId>hibernate-validator</artifactId>
-			    <version>6.1.0.Final</version>
+			    <version>6.1.2.Final</version>
 			</dependency>
 
 			<dependency>
@@ -747,7 +742,7 @@
 			<dependency>
 				<groupId>com.squareup.okhttp3</groupId>
 				<artifactId>okhttp</artifactId>
-				<version>4.2.2</version>
+				<version>4.4.1</version>
 				<scope>compile</scope>
 			</dependency>
 
@@ -868,10 +863,95 @@
 			</dependency>
 			<!-- dropwizard metrics end -->
 
+			<dependency>
+				<groupId>org.reactivestreams</groupId>
+				<artifactId>reactive-streams</artifactId>
+				<version>1.0.3</version>
+			</dependency>
+
+			<dependency>
+				<groupId>io.reactivex</groupId>
+				<artifactId>rxjava</artifactId>
+				<version>1.3.8</version>
+			</dependency>
+			<dependency>
+				<groupId>io.reactivex</groupId>
+				<artifactId>rxjava-reactive-streams</artifactId>
+				<version>1.2.1</version>
+			</dependency>
+
+			<dependency>
+				<groupId>io.projectreactor</groupId>
+				<artifactId>reactor-core</artifactId>
+				<version>3.3.4.RELEASE</version>
+			</dependency>
+
+			<!-- shiro start -->
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-core</artifactId>
+				<version>${shiro.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-aspectj</artifactId>
+				<version>${shiro.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-spring</artifactId>
+				<version>${shiro.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.shiro</groupId>
+				<artifactId>shiro-web</artifactId>
+				<version>${shiro.version}</version>
+			</dependency>
+			<!-- shiro end -->
+
+			<!-- pac4j start -->
+			<dependency>
+				<groupId>org.pac4j</groupId>
+				<artifactId>pac4j-config</artifactId>
+				<version>${pac4j.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.zaxxer</groupId>
+						<artifactId>HikariCP</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.pac4j</groupId>
+				<artifactId>pac4j-cas</artifactId>
+				<version>${pac4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.pac4j</groupId>
+				<artifactId>pac4j-http</artifactId>
+				<version>${pac4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.pac4j</groupId>
+				<artifactId>pac4j-oauth</artifactId>
+				<version>${pac4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.pac4j</groupId>
+				<artifactId>pac4j-jwt</artifactId>
+				<version>${pac4j.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.pac4j</groupId>
+				<artifactId>spring-webmvc-pac4j</artifactId>
+				<version>${pac4j.version}</version>
+			</dependency>
+			<!-- pac4j end -->
+
 			<dependency>
 				<groupId>org.yaml</groupId>
 				<artifactId>snakeyaml</artifactId>
-				<version>1.25</version>
+				<version>1.26</version>
 			</dependency>
 
 			<dependency>
@@ -880,6 +960,12 @@
 				<version>2.7.7</version>
 			</dependency>
 
+			<dependency>
+				<groupId>org.hdrhistogram</groupId>
+				<artifactId>HdrHistogram</artifactId>
+				<version>2.1.12</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.aspectj</groupId>
 				<artifactId>aspectjrt</artifactId>
@@ -1004,7 +1090,7 @@
 			<dependency>
 			    <groupId>com.alibaba</groupId>
 			    <artifactId>fastjson</artifactId>
-			    <version>1.2.62</version>
+			    <version>1.2.67</version>
 			</dependency>
 
 			<dependency>
@@ -1061,7 +1147,7 @@
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.12</version>
+				<version>4.13</version>
 				<scope>test</scope>
 			</dependency>
 		</dependencies>
@@ -1099,12 +1185,14 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
 					<version>3.1.0</version>
+                	<configuration>
+                    	<attach>true</attach>
+                	</configuration>
 					<executions>
 						<execution>
 							<id>attach-source</id>
-							<phase>deploy</phase>
 							<goals>
-								<goal>jar</goal>
+								<goal>jar-no-fork</goal>
 							</goals>
 						</execution>
 					</executions>
@@ -1121,7 +1209,6 @@
 					<executions>
 						<execution>
 							<id>attach-javadoc</id>
-							<phase>deploy</phase>
 							<goals>
 								<goal>jar</goal>
 							</goals>
@@ -1146,7 +1233,7 @@
 					<executions>
 						<execution>
 							<id>sign-artifacts</id>
-							<phase>install</phase>
+							<phase>verify</phase>
 							<goals>
 								<goal>sign</goal>
 							</goals>
@@ -1179,6 +1266,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-gpg-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.sonatype.plugins</groupId>
+				<artifactId>nexus-staging-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>