fix: 合并master代码

apache · Feb 1, 2024 · 8e30a51 · 8e30a51
2 parents 26f1e20 + 82a34db
commit 8e30a51
Show file tree

Hide file tree

Showing 336 changed files with 3,056 additions and 540 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,6 +40,14 @@ jobs:
             os: ubuntu-latest
           - java: 17
             os: ubuntu-latest
+          - java: 18
+            os: ubuntu-latest
+          - java: 19
+            os: ubuntu-latest
+          - java: 20
+            os: ubuntu-latest
+          - java: 21
+            os: ubuntu-latest
     runs-on: ${{ matrix.os }}
     if: (github.repository == 'apache/shenyu')
     steps:

diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,5 @@ Thumbs.db
 # agent build ignore
 /agent/
 
+# rust ignore
+*.lock
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 SHENYU_HOME :=  "."
-VERSION ?= "2.6.2-SNAPSHOT"
+VERSION ?= "2.7.0-SNAPSHOT"
 
 REGISTRY ?= "docker.io"
 REPOSITORY_PREF ?= "apache/shenyu"

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
     <groupId>org.apache.shenyu</groupId>
     <artifactId>shenyu</artifactId>
     <packaging>pom</packaging>
-    <version>2.6.2-SNAPSHOT</version>
+    <version>2.7.0-SNAPSHOT</version>
     <name>shenyu</name>
     <modules>
         <module>shenyu-admin</module>
@@ -159,7 +159,7 @@
         <javatuples.version>1.2</javatuples.version>
         <k8s-client.version>17.0.2</k8s-client.version>
         <polaris.version>1.13.0</polaris.version>
-        <bytebuddy.version>1.12.6</bytebuddy.version>
+        <bytebuddy.version>1.14.11</bytebuddy.version>
         <spring-ldap.version>2.3.4.RELEASE</spring-ldap.version>
         <jaxb.api.version>2.3.1</jaxb.api.version>
         <mail.version>1.6.2</mail.version>
@@ -182,6 +182,7 @@
         <casdoor-java-sdk.version>1.9.0</casdoor-java-sdk.version>
         <huawei-log-sdk.version>1.0.1</huawei-log-sdk.version>
         <opengauss-jdbc.version>5.0.0-og</opengauss-jdbc.version>
+        <wasmtime-java.version>0.19.0</wasmtime-java.version>
         <!-- dependency version end -->
     </properties>
 
@@ -528,6 +529,12 @@
                 <artifactId>kafka-clients</artifactId>
                 <version>${kafka-clients.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>io.github.kawamuray.wasmtime</groupId>
+                <artifactId>wasmtime-java</artifactId>
+                <version>${wasmtime-java.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/shenyu-admin-listener/pom.xml b/shenyu-admin-listener/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener</artifactId>
@@ -36,4 +36,4 @@
         <module>shenyu-admin-listener-polaris</module>
         <module>shenyu-admin-listener-zookeeper</module>
     </modules>
-</project>
+</project>
diff --git a/shenyu-admin-listener/shenyu-admin-listener-api/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-admin-listener</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener-api</artifactId>
@@ -44,4 +44,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/shenyu-admin-listener/shenyu-admin-listener-apollo/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-apollo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-admin-listener</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener-apollo</artifactId>
@@ -70,4 +70,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/shenyu-admin-listener/shenyu-admin-listener-consul/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-consul/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-admin-listener</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener-consul</artifactId>
@@ -45,4 +45,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/shenyu-admin-listener/shenyu-admin-listener-etcd/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-etcd/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-admin-listener</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener-etcd</artifactId>
@@ -56,4 +56,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/shenyu-admin-listener/shenyu-admin-listener-nacos/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-nacos/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-admin-listener</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener-nacos</artifactId>
@@ -51,4 +51,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/shenyu-admin-listener/shenyu-admin-listener-polaris/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-polaris/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-admin-listener</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener-polaris</artifactId>
@@ -44,4 +44,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/shenyu-admin-listener/shenyu-admin-listener-zookeeper/pom.xml b/shenyu-admin-listener/shenyu-admin-listener-zookeeper/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-admin-listener</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>shenyu-admin-listener-zookeeper</artifactId>
@@ -63,4 +63,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shenyu-admin</artifactId>

diff --git a/shenyu-alert/pom.xml b/shenyu-alert/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shenyu-alert</artifactId>

diff --git a/shenyu-bootstrap/pom.xml b/shenyu-bootstrap/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shenyu-bootstrap</artifactId>
@@ -535,15 +535,15 @@
             <version>${project.version}</version>
         </dependency>
         <!--shenyu logging-kafka plugin end-->
-        
+
         <!--shenyu logging-rabbitmq plugin start-->
         <dependency>
             <groupId>org.apache.shenyu</groupId>
             <artifactId>shenyu-spring-boot-starter-plugin-logging-rabbitmq</artifactId>
             <version>${project.version}</version>
         </dependency>
         <!--shenyu logging-rabbitmq plugin end-->
-        
+
         <!--shenyu logging-elasticsearch plugin start-->
         <dependency>
             <groupId>org.apache.shenyu</groupId>

diff --git a/shenyu-client/pom.xml b/shenyu-client/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shenyu-client</artifactId>
     <packaging>pom</packaging>
-    
+
     <modules>
         <module>shenyu-client-core</module>
         <module>shenyu-client-http</module>

diff --git a/shenyu-client/shenyu-client-api-docs-annotations/pom.xml b/shenyu-client/shenyu-client-api-docs-annotations/pom.xml
@@ -19,10 +19,10 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-client</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shenyu-client-api-docs-annotations</artifactId>
 
-</project>
+</project>
diff --git a/shenyu-client/shenyu-client-autoconfig/pom.xml b/shenyu-client/shenyu-client-autoconfig/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>shenyu-client</artifactId>
         <groupId>org.apache.shenyu</groupId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,4 +37,4 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/shenyu-client/shenyu-client-core/pom.xml b/shenyu-client/shenyu-client-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.shenyu</groupId>
         <artifactId>shenyu-client</artifactId>
-        <version>2.6.2-SNAPSHOT</version>
+        <version>2.7.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>shenyu-client-core</artifactId>
@@ -82,4 +82,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/...main/java/org/apache/shenyu/client/core/disruptor/ShenyuClientRegisterEventPublisher.java b/...main/java/org/apache/shenyu/client/core/disruptor/ShenyuClientRegisterEventPublisher.java
@@ -30,11 +30,11 @@
  * The type shenyu client register event publisher.
  */
 public class ShenyuClientRegisterEventPublisher {
-    
+
     private static final ShenyuClientRegisterEventPublisher INSTANCE = new ShenyuClientRegisterEventPublisher();
-    
+
     private DisruptorProviderManage<DataTypeParent> providerManage;
-    
+
     /**
      * Get instance.
      *
@@ -43,7 +43,7 @@ public class ShenyuClientRegisterEventPublisher {
     public static ShenyuClientRegisterEventPublisher getInstance() {
         return INSTANCE;
     }
-    
+
     /**
      * Start.
      *
@@ -57,6 +57,15 @@ public void start(final ShenyuClientRegisterRepository shenyuClientRegisterRepos
         providerManage = new DisruptorProviderManage<>(factory);
         providerManage.startup();
     }
+
+    /**
+     * Retrieves the Disruptor provider manager used by this ShenyuClientRegisterEventPublisher.
+     *
+     * @return The Disruptor provider manager.
+     */
+    public DisruptorProviderManage<DataTypeParent> getProviderManage() {
+        return providerManage;
+    }
 
     /**
      * Publish event.
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,3 +44,5 @@ Thumbs.db @@
     # agent build ignore
     /agent/
+    # rust ignore
+    *.lock