This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 1deb221f8c2 branch-2.1: [chore](ci)Replace local setup-maven with
setup-java for more stable and simplified Maven setup #52229 (#52257)
1deb221f8c2 is described below
commit 1deb221f8c2ac39143e5b60647a75e17f81d3b7a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Jun 28 11:13:19 2025 +0800
branch-2.1: [chore](ci)Replace local setup-maven with setup-java for more
stable and simplified Maven setup #52229 (#52257)
Cherry-picked from #52229
Co-authored-by: Calvin Kirs <[email protected]>
---
.github/actions/setup-maven | 1 -
.github/workflows/checkstyle.yaml | 8 +++++---
.gitmodules | 3 ---
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/.github/actions/setup-maven b/.github/actions/setup-maven
deleted file mode 160000
index 417e1a98996..00000000000
--- a/.github/actions/setup-maven
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 417e1a9899611c0350621d1fb0c2770f35105c69
diff --git a/.github/workflows/checkstyle.yaml
b/.github/workflows/checkstyle.yaml
index a53a19d8264..54eb582ad9d 100644
--- a/.github/workflows/checkstyle.yaml
+++ b/.github/workflows/checkstyle.yaml
@@ -51,11 +51,13 @@ jobs:
- 'gensrc/proto/**'
- 'gensrc/thrift/**'
- - name: Setup Maven Action
+ - name: Set up JDK with Maven
if: steps.filter.outputs.fe_changes == 'true'
- uses: ./.github/actions/setup-maven
+ uses: actions/setup-java@v4
with:
- maven-version: 3.8.4
+ distribution: 'temurin'
+ java-version: '17'
+ cache: 'maven'
- name: Run java checkstyle
if: steps.filter.outputs.fe_changes == 'true'
diff --git a/.gitmodules b/.gitmodules
index ae714f05c1a..a6bba174f97 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
[submodule ".github/actions/get-workflow-origin"]
path = .github/actions/get-workflow-origin
url = https://github.com/potiuk/get-workflow-origin.git
-[submodule ".github/actions/setup-maven"]
- path = .github/actions/setup-maven
- url = https://github.com/stCarolas/setup-maven.git
[submodule ".github/actions/paths-filter"]
path = .github/actions/paths-filter
url = https://github.com/dorny/paths-filter
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
