From 17f5374096d9d3086bbc11d184ff7ad77a222c6a Mon Sep 17 00:00:00 2001
From: Sutra Zhou <zhoushuqun@gmail.com>
Date: Mon, 16 Aug 2021 18:50:08 +0800
Subject: [PATCH] Upgrade dependencies.

---
 maven-version-rules.xml  | 23 +++++++++++++++++
 pom.xml                  | 55 ++++++++++++++++++++++++++++++++++++++--
 weixin4j-base/pom.xml    |  6 +----
 weixin4j-example/pom.xml |  3 ---
 weixin4j-mp/pom.xml      |  1 -
 weixin4j-pay/pom.xml     |  1 -
 weixin4j-server/pom.xml  |  3 ---
 weixin4j-serverX/pom.xml |  6 -----
 weixin4j-wxa/pom.xml     |  6 ++---
 9 files changed, 79 insertions(+), 25 deletions(-)
 create mode 100644 maven-version-rules.xml

diff --git a/maven-version-rules.xml b/maven-version-rules.xml
new file mode 100644
index 00000000..b3872f47
--- /dev/null
+++ b/maven-version-rules.xml
@@ -0,0 +1,23 @@
+<ruleset comparisonMethod="maven"
+	xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+		http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0
+		http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+	<ignoreVersions>
+		<ignoreVersion type="regex">.*(-|\.)(alpha|Alpha|ALPHA|beta|Beta|BETA|rc|RC).*</ignoreVersion>
+	</ignoreVersions>
+	<rules>
+		<rule groupId="javax.servlet" comparisonMethod="maven">
+			<ignoreVersions>
+				<ignoreVersion type="regex">.*-alpha[\.\-].*</ignoreVersion>
+				<ignoreVersion type="regex">.*-b[0-9]+</ignoreVersion>
+			</ignoreVersions>
+		</rule>
+		<rule groupId="javax.xml" comparisonMethod="maven">
+			<ignoreVersions>
+				<ignoreVersion type="regex">.*-b.*</ignoreVersion>
+			</ignoreVersions>
+		</rule>
+	</rules>
+</ruleset>
diff --git a/pom.xml b/pom.xml
index 24a6cdd6..adaf509e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,6 @@
 		<maven.compiler.source>1.6</maven.compiler.source>
 		<maven.compiler.target>1.6</maven.compiler.target>
 		<locales>zh_CN</locales>
-		<fastjson.version>1.2.31</fastjson.version>
 	</properties>
 	<build>
 		<plugins>
@@ -103,6 +102,13 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>versions-maven-plugin</artifactId>
+				<configuration>
+					<rulesUri>file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
+				</configuration>
+			</plugin>
 		</plugins>
 		<pluginManagement>
 			<plugins>
@@ -276,6 +282,16 @@
 	</profiles>
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>javax.servlet.jsp</groupId>
+				<artifactId>jsp-api</artifactId>
+				<version>2.2</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.xml.bind</groupId>
+				<artifactId>jaxb-api</artifactId>
+				<version>2.3.1</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpclient</artifactId>
@@ -286,10 +302,45 @@
 				<artifactId>bcprov-jdk16</artifactId>
 				<version>1.46</version>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-context</artifactId>
+				<version>5.3.9</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework</groupId>
+				<artifactId>spring-webmvc</artifactId>
+				<version>5.3.9</version>
+			</dependency>
+			<dependency>
+				<groupId>com.alibaba</groupId>
+				<artifactId>fastjson</artifactId>
+				<version>1.2.78</version>
+			</dependency>
+			<dependency>
+				<groupId>com.squareup.okhttp3</groupId>
+				<artifactId>okhttp</artifactId>
+				<version>4.9.1</version>
+			</dependency>
+			<dependency>
+				<groupId>ch.qos.logback</groupId>
+				<artifactId>logback-core</artifactId>
+				<version>1.2.5</version>
+			</dependency>
+			<dependency>
+				<groupId>io.netty</groupId>
+				<artifactId>netty-all</artifactId>
+				<version>4.1.67.Final</version>
+			</dependency>
+			<dependency>
+				<groupId>commons-codec</groupId>
+				<artifactId>commons-codec</artifactId>
+				<version>1.15</version>
+			</dependency>
 			<dependency>
 				<groupId>junit</groupId>
 				<artifactId>junit</artifactId>
-				<version>4.13.1</version>
+				<version>4.13.2</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml
index 3ab94260..375e5f48 100644
--- a/weixin4j-base/pom.xml
+++ b/weixin4j-base/pom.xml
@@ -26,7 +26,6 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>${fastjson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -35,7 +34,7 @@
 		<dependency>
 			<groupId>commons-httpclient</groupId>
 			<artifactId>commons-httpclient</artifactId>
-			<version>3.0</version>
+			<version>3.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -46,13 +45,11 @@
 		<dependency>
 			<groupId>io.netty</groupId>
 			<artifactId>netty-all</artifactId>
-			<version>4.1.42.Final</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>3.4.1</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -80,7 +77,6 @@
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.2.11</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
diff --git a/weixin4j-example/pom.xml b/weixin4j-example/pom.xml
index fbe6f645..005133ba 100644
--- a/weixin4j-example/pom.xml
+++ b/weixin4j-example/pom.xml
@@ -76,7 +76,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.1.3.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -87,7 +86,6 @@
 		<dependency>
 			<groupId>javax.servlet.jsp</groupId>
 			<artifactId>jsp-api</artifactId>
-			<version>2.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -103,7 +101,6 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>3.3.1</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml
index b3b9da03..480fad38 100644
--- a/weixin4j-mp/pom.xml
+++ b/weixin4j-mp/pom.xml
@@ -32,7 +32,6 @@
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.2.11</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/weixin4j-pay/pom.xml b/weixin4j-pay/pom.xml
index 0533be55..b7e60605 100644
--- a/weixin4j-pay/pom.xml
+++ b/weixin4j-pay/pom.xml
@@ -48,7 +48,6 @@
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.2.11</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml
index ad4191da..a3f3e53d 100644
--- a/weixin4j-server/pom.xml
+++ b/weixin4j-server/pom.xml
@@ -30,13 +30,11 @@
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
-			<version>${fastjson.version}</version>
 		</dependency>
 		<!-- 兼容 JDK 9+ 后的maven环境编译 -->
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.2.11</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -51,7 +49,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>4.2.0.RELEASE</version>
 			<optional>true</optional>
 			<exclusions>
 				<exclusion>
diff --git a/weixin4j-serverX/pom.xml b/weixin4j-serverX/pom.xml
index dd611991..d91226b5 100644
--- a/weixin4j-serverX/pom.xml
+++ b/weixin4j-serverX/pom.xml
@@ -12,9 +12,6 @@
 	<name>weixin4j-serverX</name>
 	<url>https://github.com/foxinmy/weixin4j/tree/master/weixin4j-serverX</url>
 	<description>微信消息接入服务(spring mvc实现)</description>
-	<properties>
-		<spring.version>4.2.0.RELEASE</spring.version>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -23,13 +20,11 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>${spring.version}</version>
 		</dependency>
 		<!-- 兼容 JDK 9+ 后的maven环境编译 -->
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
-			<version>2.2.11</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -47,7 +42,6 @@
 			<groupId>javax.servlet.jsp</groupId>
 			<artifactId>jsp-api</artifactId>
 			<scope>provided</scope>
-			<version>2.1</version>
 		</dependency>
 	</dependencies>
 	<developers>
diff --git a/weixin4j-wxa/pom.xml b/weixin4j-wxa/pom.xml
index bc44651d..ab687ec2 100644
--- a/weixin4j-wxa/pom.xml
+++ b/weixin4j-wxa/pom.xml
@@ -21,19 +21,18 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>com.foxinmy</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>weixin4j-base</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.foxinmy</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>weixin4j-mp</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
@@ -42,7 +41,6 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-core</artifactId>
-			<version>1.2.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>