Upgrade dependencies.

This commit is contained in:
Sutra Zhou 2021-08-16 18:50:08 +08:00
parent b08c9df31d
commit 17f5374096
9 changed files with 79 additions and 25 deletions

23
maven-version-rules.xml Normal file
View File

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

55
pom.xml
View File

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

View File

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

View File

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

View File

@ -32,7 +32,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.11</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

@ -48,7 +48,6 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.11</version>
<scope>provided</scope>
</dependency>
<dependency>

View File

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

View File

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

View File

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