[Chore][Zeta] Resolve PR 10551 merge conflicts

Author: davidzollo

.asf.yaml

@@ -48,6 +48,8 @@ github:
     squash: true
     merge: false
     rebase: false
+  pull_requests:
+    allow_update_branch: true
   protected_branches:
     dev:
       required_status_checks:

.github/workflows/backend.yml

@@ -134,6 +134,8 @@ jobs:
       api: ${{ steps.filter.outputs.api }}
       engine: ${{ steps.filter.outputs.engine }}
       engine-e2e: ${{ steps.filter.outputs.engine-e2e }}
+      edge-agent: ${{ steps.filter.outputs.edge-agent }}
+      edge-agent-e2e: ${{ steps.filter.outputs.edge-agent-e2e }}
       docs: ${{ steps.filter.outputs.docs }}
       ut-modules: ${{ steps.ut-modules.outputs.modules }}
       it-modules: ${{ steps.it-modules.outputs.modules }}
@@ -195,6 +197,18 @@ jobs:
           echo "engine-e2e=$true_or_false" >> $GITHUB_OUTPUT
           echo "engine-e2e_files=$file_list" >> $GITHUB_OUTPUT
           
+          edge_agent_e2e_files=`python tools/update_modules_check/check_file_updates.py ua $workspace apache/dev origin/$current_branch "seatunnel-e2e/seatunnel-edge-agent-e2e/**"`
+          true_or_false=${edge_agent_e2e_files%%$'\n'*}
+          file_list=${edge_agent_e2e_files#*$'\n'}
+          echo "edge-agent-e2e=$true_or_false" >> $GITHUB_OUTPUT
+          echo "edge-agent-e2e_files=$file_list" >> $GITHUB_OUTPUT
+          
+          edge_agent_files=`python tools/update_modules_check/check_file_updates.py ua $workspace apache/dev origin/$current_branch "seatunnel-edge-agent/**"`
+          true_or_false=${edge_agent_files%%$'\n'*}
+          file_list=${edge_agent_files#*$'\n'}
+          echo "edge-agent=$true_or_false" >> $GITHUB_OUTPUT
+          echo "edge-agent_files=$file_list" >> $GITHUB_OUTPUT
+
           api_files=`python tools/update_modules_check/check_file_updates.py ua $workspace apache/dev origin/$current_branch "seatunnel-api/**" "seatunnel-common/**" "seatunnel-config/**" "seatunnel-core/**" "seatunnel-e2e/seatunnel-e2e-common/**" "seatunnel-formats/**" "seatunnel-plugin-discovery/**" "seatunnel-transforms-v2/**" "seatunnel-translation/**" "seatunnel-e2e/seatunnel-transforms-v2-e2e/**" "pom.xml" "**/workflows/**" "tools/**" "seatunnel-dist/**"`
           true_or_false=${api_files%%$'\n'*}
           file_list=${api_files#*$'\n'}
@@ -433,7 +447,7 @@ jobs:
         run: |
           ./mvnw -B -T 1 clean verify -DskipUT=false -DskipIT=true -D"license.skipAddThirdParty"=true -D"skip.ui"=true --no-snapshot-updates
         env:
-          MAVEN_OPTS: -Xmx4096m
+          MAVEN_OPTS: -Xmx4096m -Dfile.encoding=UTF-8
 
   updated-modules-integration-test-part-1:
     needs: [ changes, sanity-check ]
@@ -505,7 +519,7 @@ jobs:
       matrix:
         java: [ '8', '11' ]
         os: [ 'ubuntu-latest' ]
-    timeout-minutes: 210
+    timeout-minutes: 300
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
@@ -626,7 +640,7 @@ jobs:
       matrix:
         java: [ '8', '11' ]
         os: [ 'ubuntu-latest' ]
-    timeout-minutes: 120
+    timeout-minutes: 210
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
@@ -657,7 +671,7 @@ jobs:
       matrix:
         java: [ '8', '11' ]
         os: [ 'ubuntu-latest' ]
-    timeout-minutes: 120
+    timeout-minutes: 210
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
@@ -705,6 +719,31 @@ jobs:
         env:
           MAVEN_OPTS: -Xmx4096m
 
+  edge-agent-it:
+    needs: [ changes, sanity-check ]
+    if: needs.changes.outputs.edge-agent == 'true' || needs.changes.outputs.edge-agent-e2e == 'true'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [ '8', '11' ]
+        os: [ 'ubuntu-latest' ]
+    timeout-minutes: 120
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: 'maven'
+      - name: free disk space
+        run: tools/github/free_disk_space.sh
+      - name: run seatunnel edge agent integration test
+        run: |
+          ./mvnw -T 1 -B verify -DskipUT=false -DskipIT=false -D"license.skipAddThirdParty"=true -D"skip.ui"=true --no-snapshot-updates -pl :seatunnel-edge-agent-e2e -am -Pci
+        env:
+          MAVEN_OPTS: -Xmx4096m
+
   engine-k8s-it:
     needs: [ changes, sanity-check ]
     if: needs.changes.outputs.api == 'true' || contains(needs.changes.outputs.it-modules, 'seatunnel-engine-k8s-e2e')

.github/workflows/upgrade_compatibility.yml

@@ -0,0 +1,85 @@
+#
+# 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: Upgrade Compatibility
+
+on:
+  workflow_dispatch:
+    inputs:
+      old_version:
+        description: "SeaTunnel release used to create the savepoint"
+        required: false
+        default: "2.3.13"
+      scenario:
+        description: "Restore scenario under tools/upgrade_compatibility/scenarios"
+        required: false
+        default: "all"
+  schedule:
+    - cron: "0 18 * * *"
+
+concurrency:
+  group: upgrade-compatibility-${{ github.ref }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+
+jobs:
+  cross-version-restore:
+    name: Cross-version restore
+    runs-on: ubuntu-latest
+    timeout-minutes: 90
+    env:
+      OLD_SEATUNNEL_VERSION: ${{ github.event.inputs.old_version || '2.3.13' }}
+      SCENARIO: ${{ github.event.inputs.scenario || 'all' }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "8"
+
+      - name: Free disk space
+        run: bash tools/github/free_disk_space.sh
+
+      - name: Build current dev distribution
+        run: >
+          ./mvnw -B -T 1 package
+          -DskipTests
+          -DskipIT=true
+          -Dlicense.skipAddThirdParty=true
+          -Dskip.ui=true
+          -pl seatunnel-dist -am
+
+      - name: Run upgrade compatibility scenarios
+        run: |
+          if [ "${SCENARIO}" = "all" ]; then
+            for scenario in generic-fake-localfile mysql-cdc-multitable-localfile; do
+              SCENARIO="${scenario}" bash tools/upgrade_compatibility/run_upgrade_compatibility.sh
+            done
+          else
+            bash tools/upgrade_compatibility/run_upgrade_compatibility.sh
+          fi
+
+      - name: Upload compatibility logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: upgrade-compatibility-logs
+          path: target/upgrade-compatibility/runs/**/logs/*.log
+          if-no-files-found: ignore

.gitignore

@@ -23,6 +23,12 @@ logs.zip
 *.iml
 .idea/*
 
+# Eclipse / M2E files
+.classpath
+.factorypath
+.project
+.settings/
+
 .DS_Store
 
 metastore_db/
@@ -60,4 +66,7 @@ node/
 
 dist/
 
-seatunnel-engine/seatunnel-engine-server/**/ui/*
+seatunnel-engine/seatunnel-engine-server/**/ui/*
+
+seatunnel-edge-agent/**/edge-agent.id
+seatunnel-edge-agent/**/tmp/