Merge pull request apache#253 from apache/master

merge master
songxiaosheng · Dec 18, 2023 · a2ccd42 · a2ccd42
2 parents db84301 + ca49157
commit a2ccd42
Show file tree

Hide file tree

Showing 122 changed files with 9,135 additions and 404 deletions.
diff --git a/.asf.yaml b/.asf.yaml
@@ -26,3 +26,10 @@ github:
   features:
     # Enable issue management
     issues: true
+    enabled_merge_buttons:
+        # enable squash button:
+        squash: true
+        # enable merge button:
+        merge: false
+        # disable rebase button:
+        rebase: false
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest, windows-2019 ]
+        os: [ ubuntu-latest]
         jdk: [ 8, 11 ]
     steps:
       - uses: actions/checkout@v2
@@ -42,7 +42,7 @@ jobs:
           ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -Dmaven.wagon.http.retryHandler.count=5 -DskipTests=false -DskipIntegrationTests=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true
       - name: "Test with Maven"
         timeout-minutes: 50
-        if: ${{ startsWith( matrix.os, 'windows') }}
+        if: ${{ startsWith( matrix.os) }}
         run: |
           cd ./dubbo-spi-extensions
           ./mvnw --batch-mode -U -e --no-transfer-progress clean test verify -Pjacoco -D"http.keepAlive=false" -D"maven.wagon.http.pool=false" -D"maven.wagon.httpconnectionManager.ttlSeconds=120" -D"maven.wagon.http.retryHandler.count=5" -DskipTests=false -DskipIntegrationTests=true -D"checkstyle.skip=false" -D"checkstyle_unix.skip=true" -D"rat.skip=false" -D"maven.javadoc.skip=true"

diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -122,7 +122,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 8,11 ]
+        java: [ 8,11]
     env:
       JAVA_VER: ${{matrix.java}}
     steps:

diff --git a/README.md b/README.md
@@ -8,6 +8,10 @@ The purpose of dubbo-spi-extensions is to provide open, community-driven, reusab
 
 Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. The available extensions are as follows:Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. 
 
+For version release notes, please refer to the documentation:
+- [Release](https://cn.dubbo.apache.org/zh-cn/download/spi-extensions/)
+- [Reference](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/spi/overview/)
+
 The available extensions are as follows:
 
 - [dubbo-api-docs](dubbo-api-docs)
@@ -39,6 +43,7 @@ The available extensions are as follows:
   - [dubbo-gateway-common](dubbo-gateway-extensions/dubbo-gateway-common)
   - [dubbo-gateway-consumer](dubbo-gateway-extensions/dubbo-gateway-consumer)
   - [dubbo-gateway-provider](dubbo-gateway-extensions/dubbo-gateway-provider)
+- [dubbo-kubernetes](dubbo-kubernetes)
 - [dubbo-metadata-report-extensions](dubbo-metadata-report-extensions)
   - [dubbo-metadata-report-consul](dubbo-metadata-report-extensions/dubbo-metadata-report-consul)
   - [dubbo-metadata-report-etcd](dubbo-metadata-report-extensions/dubbo-metadata-report-etcd)
@@ -84,6 +89,7 @@ The available extensions are as follows:
   - [dubbo-serialization-test](dubbo-serialization-extensions/dubbo-serialization-test)
 - [dubbo-tag-extensions](dubbo-tag-extensions)
   - [dubbo-tag-subnets](dubbo-tag-extensions/dubbo-tag-subnets)
+- [dubbo-xds](dubbo-xds)
 
 ## Contribution
 

diff --git a/dobbo-doc-auto-gen/src/main/java/org/apache/dubbo/doc/DocAutoGen.java b/dobbo-doc-auto-gen/src/main/java/org/apache/dubbo/doc/DocAutoGen.java
@@ -43,6 +43,11 @@ public static void main(String[] args) throws IOException {
         String usage = "Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. The available extensions are as follows:Developers can flexibly choose the required extension dependencies to develop microservice programs based on their needs. ";
         System.out.println(usage);
         System.out.println();
+        System.out.println("For version release notes, please refer to the documentation:");
+        System.out.println("- [Release](https://cn.dubbo.apache.org/zh-cn/download/spi-extensions/)");
+        System.out.println("- [Reference](https://cn.dubbo.apache.org/zh-cn/overview/mannual/java-sdk/reference-manual/spi/overview/)");
+        System.out.println();
+
         String asFollow = "The available extensions are as follows:";
         System.out.println(asFollow);
         System.out.println();

diff --git a/dubbo-extensions-dependencies-bom/pom.xml b/dubbo-extensions-dependencies-bom/pom.xml
@@ -95,7 +95,7 @@
         <spring-boot.version>2.4.1</spring-boot.version>
 
         <!-- Fabric8 for Kubernetes -->
-        <fabric8_kubernetes_version>5.3.2</fabric8_kubernetes_version>
+        <fabric8_kubernetes_version>6.9.2</fabric8_kubernetes_version>
         <hessian_version>4.0.51</hessian_version>
         <httpclient_version>4.5.13</httpclient_version>
         <jsonrpc_version>1.2.0</jsonrpc_version>
@@ -140,6 +140,9 @@
         <byte-buddy.version>1.14.5</byte-buddy.version>
         <commons_net_version>3.9.0</commons_net_version>
         <snakeyaml_version>2.0</snakeyaml_version>
+        <protobuf-java_version>3.25.1</protobuf-java_version>
+        <bouncycastle-bcprov_version>1.70</bouncycastle-bcprov_version>
+        <envoy_api_version>0.1.35</envoy_api_version>
     </properties>
 
     <dependencyManagement>
@@ -539,6 +542,36 @@
                 <artifactId>snakeyaml</artifactId>
                 <version>${snakeyaml_version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>${protobuf-java_version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java-util</artifactId>
+                <version>${protobuf-java_version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15on</artifactId>
+                <version>${bouncycastle-bcprov_version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
+                <version>${bouncycastle-bcprov_version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-ext-jdk15on</artifactId>
+                <version>${bouncycastle-bcprov_version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.envoyproxy.controlplane</groupId>
+                <artifactId>api</artifactId>
+                <version>${envoy_api_version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/dubbo-kubernetes/pom.xml b/dubbo-kubernetes/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.dubbo.extensions</groupId>
+        <artifactId>extensions-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>dubbo-kubernetes</artifactId>
+    <name>${project.artifactId}</name>
+    <description>The Kubernetes Integration</description>
+    <properties>
+        <skip_maven_deploy>false</skip_maven_deploy>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-bom</artifactId>
+                <version>3.2.9</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-common</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-metadata-api</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>kubernetes-server-mock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>3.12.4</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+</project>