Merge branch 'develop' of https://github.com/fizzgate/fizz-gateway-node into feature/v3.0.0

 Conflicts:
	fizz-core/src/main/java/com/fizzgate/filter/AggregateFilter.java
	fizz-core/src/main/java/com/fizzgate/fizz/ConfigLoader.java
	fizz-core/src/main/java/com/fizzgate/fizz/Pipeline.java
	fizz-core/src/main/java/com/fizzgate/fizz/function/CommonFunc.java
	fizz-core/src/main/java/com/fizzgate/fizz/function/FuncExecutor.java
	fizz-core/src/main/java/com/fizzgate/fizz/function/ListFunc.java
	fizz-core/src/main/java/com/fizzgate/proxy/CallbackService.java
	fizz-core/src/test/java/com/fizzgate/fizz/function/CommonFuncTests.java
	fizz-core/src/test/java/com/fizzgate/fizz/function/ListFuncTests.java
This commit is contained in:
nil.zhong
2023-06-06 18:00:40 +08:00
6 changed files with 83 additions and 59 deletions

View File

@@ -14,11 +14,11 @@
<properties>
<!--<java.version>1.8</java.version>
<spring-framework.version>5.2.23.RELEASE</spring-framework.version>
<spring-framework.version>5.2.24.RELEASE</spring-framework.version>
<spring-session-bom.version>Dragonfruit-SR3</spring-session-bom.version>
<reactor-bom.version>Dysprosium-SR25</reactor-bom.version>
<lettuce.version>5.3.7.RELEASE</lettuce.version>
<netty.version>4.1.91.Final</netty.version>
<netty.version>4.1.93.Final</netty.version>
<httpcore.version>4.4.16</httpcore.version>
<log4j2.version>2.17.2</log4j2.version>
<slf4j.version>1.7.36</slf4j.version>
@@ -32,7 +32,7 @@
<commons-codec.version>1.15</commons-codec.version>
<commons-pool2.version>2.11.1</commons-pool2.version>
<gson.version>2.8.9</gson.version>
<netty-tcnative.version>2.0.59.Final</netty-tcnative.version>
<netty-tcnative.version>2.0.61.Final</netty-tcnative.version>
<spring-cloud.version>2.2.9.RELEASE</spring-cloud.version>
<snakeyaml.version>1.33</snakeyaml.version>
<spring-data-releasetrain.version>Moore-SR13</spring-data-releasetrain.version>-->