Skip to content

Commit

Permalink
Merge branch 'master' into feat-peak-ewma
Browse files Browse the repository at this point in the history
  • Loading branch information
Aias00 authored Jan 16, 2025
2 parents ad5d312 + e463b16 commit d84cc2a
Show file tree
Hide file tree
Showing 289 changed files with 355 additions and 291 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

SHENYU_HOME := "."
VERSION ?= "2.7.0-SNAPSHOT"
VERSION ?= "2.7.1-SNAPSHOT"

REGISTRY ?= "docker.io"
REPOSITORY_PREF ?= "apache/shenyu"
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<packaging>pom</packaging>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<name>shenyu</name>
<modules>
<module>shenyu-admin</module>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin-listener/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin-listener/shenyu-admin-listener-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-admin-listener</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin-listener/shenyu-admin-listener-apollo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-admin-listener</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener-apollo</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin-listener/shenyu-admin-listener-consul/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-admin-listener</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener-consul</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin-listener/shenyu-admin-listener-etcd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-admin-listener</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener-etcd</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin-listener/shenyu-admin-listener-nacos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-admin-listener</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener-nacos</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-admin-listener</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener-polaris</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-admin-listener</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-admin-listener-zookeeper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-admin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-alert/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-alert</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-bootstrap</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-api-docs-annotations/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-autoconfig/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>shenyu-client</artifactId>
<groupId>org.apache.shenyu</groupId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-dubbo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-dubbo</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-dubbo</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-apache-dubbo</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-dubbo</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-dubbo-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-grpc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-http/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-http</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-http</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-springcloud</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-http</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-springmvc</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-motan/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-sofa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-sofa</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-tars/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-tars</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-client/shenyu-client-websocket/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-websocket</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-client-websocket</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-client-spring-websocket</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-discovery/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-discovery/shenyu-discovery-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-discovery</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-discovery/shenyu-discovery-etcd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-discovery</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery-etcd</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-discovery/shenyu-discovery-eureka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-discovery</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>

<artifactId>shenyu-discovery-eureka</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-discovery/shenyu-discovery-nacos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-discovery</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery-nacos</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-discovery/shenyu-discovery-zookeeper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-discovery</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-discovery-zookeeper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-disruptor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-disruptor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-admin-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-admin-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-bootstrap-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>shenyu-bootstrap-dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-docker-compose-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<artifactId>shenyu-docker-compose-dist</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-dist/shenyu-src-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-dist</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<artifactId>shenyu-src-dist</artifactId>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
Expand Down
2 changes: 1 addition & 1 deletion shenyu-examples/shenyu-examples-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.shenyu</groupId>
<artifactId>shenyu-examples</artifactId>
<version>2.7.0-SNAPSHOT</version>
<version>2.7.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Loading

0 comments on commit d84cc2a

Please sign in to comment.