fix conflict

.asf.yaml

@@ -38,7 +38,7 @@ github:
     - hacktoberfest
   enabled_merge_buttons:
     squash: true
-    merge: true
+    merge: false
     rebase: false
   protected_branches:
     master:
@@ -47,6 +47,25 @@ github:
       required_pull_request_reviews:
         dismiss_stale_reviews: true
         required_approving_review_count: 2
+  # Attempt to make the auto-generated github emails more easily readable in email clients.
+  custom_subjects:
+    new_pr: "[PR] {title} ({repository})"
+    close_pr: "Re: [PR] {title} ({repository})"
+    comment_pr: "Re: [PR] {title} ({repository})"
+    diffcomment: "Re: [PR] {title} ({repository})"
+    merge_pr: "Re: [PR] {title} ({repository})"
+    new_issue: "[I] {title} ({repository})"
+    comment_issue: "Re: [I] {title} ({repository})"
+    close_issue: "Re: [I] {title} ({repository})"
+    catchall: "[GH] {title} ({repository})"
+    new_discussion: "[D] {title} ({repository})"
+    edit_discussion: "Re: [D] {title} ({repository})"
+    close_discussion: "Re: [D] {title} ({repository})"
+    close_discussion_with_comment: "Re: [D] {title} ({repository})"
+    reopen_discussion: "Re: [D] {title} ({repository})"
+    new_comment_discussion: "Re: [D] {title} ({repository})"
+    edit_comment_discussion: "Re: [D] {title} ({repository})"
+    delete_comment_discussion: "Re: [D] {title} ({repository})"
 notifications:
     commits: commits@eventmesh.apache.org
     # Send all issue emails (new, closed, comments) to issues@

.gitattributes

@@ -0,0 +1,20 @@
+#
+# 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.
+#
+*.sh text eol=lf
+gradlew text eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -55,6 +55,11 @@ body:
       description: Describe the EventMesh version.
       options:
         - master
+        - 1.10.0
+        - 1.9.0
+        - 1.8.0
+        - 1.7.0
+        - 1.6.0
         - 1.5.0
         - 1.4.0
         - 1.3.0
@@ -89,6 +94,7 @@ body:
       description: Anything else we need to know?
       placeholder: >
         Add your debug logs here.
+      render: Java
     validations:
       required: false
 
@@ -101,6 +107,14 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
+
   - type: markdown
     attributes:
       value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/documentation_related.yml

@@ -55,6 +55,14 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
+
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/enhancement_request.yml

@@ -65,6 +65,13 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -57,6 +57,14 @@ body:
       options:
         - label: Yes I am willing to submit a PR!
 
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: >
+        The Code of Conduct helps create a safe space for everyone. We require that everyone agrees to it..
+      options:
+        - label: I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct) *
+
   - type: markdown
     attributes:
       value: "Thanks for completing our form!"

.github/ISSUE_TEMPLATE/unit_test.yml

@@ -41,7 +41,7 @@ body:
     attributes:
       label: Read the unit testing guidelines
       description: >
-        Read the [unit testing guidelines](https://github.com/apache/eventmesh/blob/master/docs/en/contribute/02-write-unit-test.md) before writing unit test code.
+        Read the [unit testing guidelines](https://eventmesh.apache.org/community/contribute/write-unit-test) before writing unit test code.
       options:
         - label: >
             I have read.
@@ -83,4 +83,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for completing our form!"
+      value: "Thanks for completing our form!"

.github/PULL_REQUEST_TEMPLATE.md

@@ -23,21 +23,17 @@
 (If this PR fixes a GitHub issue, please add `Fixes #<XXX>` or `Closes #<XXX>`.)
 -->
 
-Fixes #<XXXX>.
+Fixes #issue_id
 
 ### Motivation
 
 *Explain the content here.*
 *Explain why you want to make the changes and what problem you're trying to solve.*
 
-
-
 ### Modifications
 
 *Describe the modifications you've done.*
 
-
-
 ### Documentation
 
 - Does this pull request introduce a new feature? (yes / no)

.github/workflows/ci.yml

@@ -33,45 +33,50 @@ jobs:
       matrix:
         os: [ ubuntu-latest, macOS-latest ]
         java: [ 8, 11 ]
+        language: ['java']
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+      - if: matrix.language == 'cpp' || matrix.language == 'csharp'
+        name: Build C
+        run: |
+          git submodule init
+          git submodule update
+          make -C ./eventmesh-sdks/eventmesh-sdk-c  
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-          languages: ${{ matrix.language }}
+          distribution: 'zulu'
+          java-version: 11
+
+      - name: GenerateGrammarSource
+        run: ./gradlew clean generateGrammarSource --parallel --daemon
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
 
-      - name: Cache Gradle packages
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
-
       # https://docs.gradle.org/current/userguide/performance.html
       - name: Build
-        run: ./gradlew clean build jar dist jacocoTestReport --parallel --daemon
+        run: ./gradlew clean build dist jacocoTestReport -x spotlessJava -x generateGrammarSource --parallel --daemon
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Install plugin
         run: ./gradlew installPlugin
-
-      - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v2
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
 
       - name: Upload coverage report to codecov.io
         run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!'
@@ -91,4 +96,6 @@ jobs:
 
       - name: Check third party dependencies
         run: |
-          ./gradlew clean jar dist -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success"
+          ./gradlew clean dist -x spotlessJava -x test -x checkstyleMain -x javaDoc && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies check success"
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

.github/workflows/codeql.yml

@@ -0,0 +1,69 @@
+#
+# 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.
+#
+
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  build:
+    name: Analyze
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['java', 'go']
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+          languages: ${{ matrix.language }}
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        if: matrix.language == 'java'
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: 11
+        if: matrix.language == 'java'
+
+      # https://docs.gradle.org/current/userguide/performance.html
+      - name: Build
+        run: ./gradlew clean assemble compileTestJava --no-build-cache --parallel --daemon
+        env:
+          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+        if: matrix.language == 'java'
+
+      - name: Perform CodeQL analysis
+        uses: github/codeql-action/analyze@v2