resolve all conflicts

.github/dependabot.yml

@@ -26,6 +26,7 @@ updates:
         - "prost*"
     opentelemetry:
       patterns:
+        - "opentelemetry"
         - "opentelemetry*"
         - "tracing-opentelemetry"
     mysql:

.github/workflows/cherry-pick-to-release-branch.yml

@@ -3,11 +3,11 @@ on:
   pull_request:
     branches:
       - main
-    types: ["closed"]
+    types: ["closed", "labeled"]
 
 jobs:
-  release_pull_request_1_5:
-    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.5')  &&  github.event.pull_request.merged == true"
+  release_pull_request_1_7_standalone:
+    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.7-standalone')  &&  github.event.pull_request.merged == true"
     runs-on: ubuntu-latest
     name: release_pull_request
     steps:
@@ -16,9 +16,25 @@ jobs:
       - name: Create PR to branch
         uses: risingwavelabs/github-action-cherry-pick@master
         with:
-          pr_branch: 'release-1.5'
+          pr_branch: 'release-1.7.0-standalone'
           pr_labels: 'cherry-pick'
-          pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.5', github.event.number) }}
+          pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7.0-standalone', github.event.number) }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  release_pull_request_1_7:
+    if: "contains(github.event.pull_request.labels.*.name, 'need-cherry-pick-release-1.7')  &&  github.event.pull_request.merged == true"
+    runs-on: ubuntu-latest
+    name: release_pull_request
+    steps:
+      - name: checkout
+        uses: actions/checkout@v1
+      - name: Create PR to branch
+        uses: risingwavelabs/github-action-cherry-pick@master
+        with:
+          pr_branch: 'release-1.7'
+          pr_labels: 'cherry-pick'
+          pr_body: ${{ format('Cherry picking \#{0} onto branch release-1.7', github.event.number) }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.licenserc.yaml

@@ -17,6 +17,7 @@ header:
     - "**/*.d.ts"
     - "src/sqlparser/**/*.rs"
     - "java/connector-node/risingwave-source-cdc/src/main/java/com/risingwave/connector/cdc/debezium/internal/*.java"
+    - "java/connector-node/risingwave-sink-iceberg/src/main/java/org/apache/iceberg/**/*.java"
     - "src/meta/model_v2/migration/**/*.rs"
     - "lints/ui/**"
 

.typos.toml

@@ -20,7 +20,8 @@ extend-exclude = [
     "scripts",
     "src/frontend/planner_test/tests/testdata",
     "src/tests/sqlsmith/tests/freeze",
-    "src/workspace-hack/Cargo.toml",
+    "Cargo.lock",
+    "**/Cargo.toml",
     "**/go.mod",
     "**/go.sum",
 ]