Merge branch 'develop' of https://github.com/wehotel/fizz-gateway-community into develop
# Conflicts: # src/main/java/we/filter/FizzGatewayFilter.java
This commit is contained in:
21
pom.xml
21
pom.xml
@@ -5,7 +5,7 @@
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>2.2.10.RELEASE</version>
|
||||
<version>2.2.11.RELEASE</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
<groupId>we</groupId>
|
||||
@@ -34,10 +34,13 @@
|
||||
|
||||
<properties>
|
||||
<java.version>1.8</java.version>
|
||||
<log4j2.version>2.13.3</log4j2.version>
|
||||
<netty.version>4.1.53.Final</netty.version>
|
||||
<httpclient.version>4.5.13</httpclient.version>
|
||||
<spring-framework.version>5.2.11.RELEASE</spring-framework.version>
|
||||
<reactor-bom.version>Dysprosium-SR14</reactor-bom.version>
|
||||
<lettuce.version>5.3.5.RELEASE</lettuce.version>
|
||||
<nacos.version>0.2.7</nacos.version>
|
||||
<netty.version>4.1.54.Final</netty.version>
|
||||
<httpcore.version>4.4.14</httpcore.version>
|
||||
<log4j2.version>2.13.3</log4j2.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
@@ -67,7 +70,7 @@
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>fastjson</artifactId>
|
||||
<version>1.2.74</version>
|
||||
<version>1.2.75</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
@@ -146,13 +149,19 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
|
||||
<version>2.2.5.RELEASE</version>
|
||||
<version>2.2.6.RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.alibaba.boot</groupId>
|
||||
<artifactId>nacos-config-spring-boot-starter</artifactId>
|
||||
<version>${nacos.version}</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-logging</artifactId>
|
||||
</exclusion>
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.alibaba.boot</groupId>
|
||||
|
||||
Reference in New Issue
Block a user