Skip to content

Commit 98cb1e6

Browse files
EarthChenEarthChen
authored
Merge branch '3.3' into dependabot/maven/org.codehaus.mojo-build-helper-maven-plugin-3.6.1
2 parents 75b5b47 + 13c021d commit 98cb1e6

File tree

669 files changed

+14311
-2717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

669 files changed

+14311
-2717
lines changed

‎.artifacts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dubbo-filter-cache
4141
dubbo-filter-validation
4242
dubbo-kubernetes
4343
dubbo-maven-plugin
44+
dubbo-mcp
4445
dubbo-metadata
4546
dubbo-metadata-api
4647
dubbo-metadata-definition-protobuf
@@ -56,6 +57,7 @@ dubbo-metrics-registry
5657
dubbo-metrics-config-center
5758
dubbo-metrics-netty
5859
dubbo-metrics-event
60+
dubbo-mutiny
5961
dubbo-native
6062
dubbo-parent
6163
dubbo-plugin
@@ -107,6 +109,7 @@ dubbo-zookeeper-curator5-spring-boot-starter
107109
dubbo-sentinel-spring-boot-starter
108110
dubbo-seata-spring-boot-starter
109111
dubbo-spring-security
112+
dubbo-spring6-security
110113
dubbo-tracing
111114
dubbo-xds
112115
dubbo-plugin-loom

‎.asf.yaml‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,51 @@ github:
3737
# Enable GitHub Discussions for community discussions
3838
discussions: true
3939
protected_branches:
40-
master: {}
41-
2.5.x: {}
42-
2.6.x: {}
43-
2.7.x: {}
44-
3.0: {}
45-
3.1: {}
46-
3.2: {}
47-
3.3: {}
48-
3.4: {}
40+
master:
41+
required_pull_request_reviews:
42+
dismiss_stale_reviews: true
43+
require_last_push_approval: true
44+
required_approving_review_count: 2
45+
2.5.x:
46+
required_pull_request_reviews:
47+
dismiss_stale_reviews: true
48+
require_last_push_approval: true
49+
required_approving_review_count: 2
50+
2.6.x:
51+
required_pull_request_reviews:
52+
dismiss_stale_reviews: true
53+
require_last_push_approval: true
54+
required_approving_review_count: 2
55+
2.7.x:
56+
required_pull_request_reviews:
57+
dismiss_stale_reviews: true
58+
require_last_push_approval: true
59+
required_approving_review_count: 2
60+
3.0:
61+
required_pull_request_reviews:
62+
dismiss_stale_reviews: true
63+
require_last_push_approval: true
64+
required_approving_review_count: 2
65+
3.1:
66+
required_pull_request_reviews:
67+
dismiss_stale_reviews: true
68+
require_last_push_approval: true
69+
required_approving_review_count: 2
70+
3.2:
71+
required_pull_request_reviews:
72+
dismiss_stale_reviews: true
73+
require_last_push_approval: true
74+
required_approving_review_count: 2
75+
3.3:
76+
required_pull_request_reviews:
77+
dismiss_stale_reviews: true
78+
require_last_push_approval: true
79+
required_approving_review_count: 2
80+
3.4:
81+
required_pull_request_reviews:
82+
dismiss_stale_reviews: true
83+
require_last_push_approval: true
84+
required_approving_review_count: 2
4985
labels:
5086
- java
5187
- rpc

‎.github/workflows/build-and-test-pr.yml‎

Lines changed: 53 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ env:
3535
jobs:
3636
check-format:
3737
name: "Check if code needs formatting"
38-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-22.04
3939
steps:
4040
- name: "Checkout"
4141
uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
7676
license:
7777
name: "Check License"
7878
needs: check-format
79-
runs-on: ubuntu-latest
79+
runs-on: ubuntu-22.04
8080
steps:
8181
- uses: actions/checkout@v4
8282
- name: "Check License"
@@ -102,7 +102,7 @@ jobs:
102102
build-source:
103103
name: "Build Dubbo"
104104
needs: check-format
105-
runs-on: ubuntu-latest
105+
runs-on: ubuntu-22.04
106106
outputs:
107107
version: ${{ steps.dubbo-version.outputs.version }}
108108
steps:
@@ -175,7 +175,7 @@ jobs:
175175
unit-test-prepare:
176176
name: "Preparation for Unit Test"
177177
needs: check-format
178-
runs-on: ubuntu-latest
178+
runs-on: ubuntu-22.04
179179
strategy:
180180
fail-fast: false
181181
env:
@@ -197,35 +197,39 @@ jobs:
197197
- name: "Download zookeeper binary archive in Linux OS"
198198
run: |
199199
mkdir -p ${{ github.workspace }}/.tmp/zookeeper
200-
wget -c https://archive.apache.org/dist/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
201-
wget -c https://apache.website-solution.net/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
202-
wget -c http://apache.stu.edu.tw/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
203-
wget -c http://ftp.jaist.ac.jp/pub/apache/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
204-
wget -c http://apache.mirror.cdnetworks.com/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
205-
wget -c http://mirror.apache-kr.org/apache/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz
200+
wget -t 1 -T 120 -c https://archive.apache.org/dist/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
201+
wget -t 1 -T 120 -c https://apache.website-solution.net/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
202+
wget -t 1 -T 120 -c http://ftp.jaist.ac.jp/pub/apache/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
203+
wget -t 1 -T 120 -c http://apache.mirror.cdnetworks.com/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz ||
204+
wget -t 1 -T 120 -c http://mirror.apache-kr.org/apache/zookeeper/zookeeper-${{ env.ZOOKEEPER_VERSION }}/apache-zookeeper-${{ env.ZOOKEEPER_VERSION }}-bin.tar.gz -O ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz
206205
echo "list the downloaded zookeeper binary archive"
207206
ls -al ${{ github.workspace }}/.tmp/zookeeper/apache-zookeeper-bin.tar.gz
208207
209208
unit-test:
210209
needs: [check-format, unit-test-prepare]
211-
name: "Unit Test On ubuntu-latest"
212-
runs-on: ubuntu-latest
210+
name: "Unit Test On ubuntu-22.04 Java: ${{ matrix.java }}"
211+
runs-on: ubuntu-22.04
213212
strategy:
214213
fail-fast: false
214+
matrix:
215+
java: [ 8, 11, 17, 21, 25 ]
215216
env:
216217
DISABLE_FILE_SYSTEM_TEST: true
217218
CURRENT_ROLE: ${{ matrix.case-role }}
218219
ZOOKEEPER_VERSION: 3.7.2
219220
steps:
221+
- name: "Set MAVEN_OPTS for JDK 24+"
222+
if: ${{ matrix.java >= 24 }}
223+
run: echo "MAVEN_OPTS=--sun-misc-unsafe-memory-access=allow" >> $GITHUB_ENV
220224
- name: "Checkout code"
221225
uses: actions/checkout@v4
222226
with:
223227
fetch-depth: 0
224-
- name: "Set up JDK 21"
228+
- name: "Set up JDK ${{ matrix.java }}"
225229
uses: actions/setup-java@v4
226230
with:
227231
distribution: 'zulu'
228-
java-version: 21
232+
java-version: ${{ matrix.java }}
229233
- name: "Set current date as env variable"
230234
run: echo "TODAY=$(date +'%Y%m%d')" >> $GITHUB_ENV
231235
- name: "Cache local maven repository"
@@ -244,8 +248,15 @@ jobs:
244248
key: zookeeper-${{ runner.os }}-${{ env.ZOOKEEPER_VERSION }}
245249
restore-keys: |
246250
zookeeper-${{ runner.os }}-
247-
- name: "Test with maven"
251+
- name: "Test with maven on Java: 8"
252+
timeout-minutes: 90
253+
if: ${{ matrix.java == '8' }}
254+
run: |
255+
set -o pipefail
256+
./mvnw ${{ env.MAVEN_ARGS }} clean test verify -Pjacoco,'!jdk15ge-add-open',skip-spotless -DtrimStackTrace=false -Dmaven.test.skip=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper 2>&1 | tee >(grep -n -B 1 -A 200 "FAILURE! -- in" > test_errors.log)
257+
- name: "Test with maven on Java: ${{ matrix.java }}"
248258
timeout-minutes: 90
259+
if: ${{ matrix.java != '8' }}
249260
run: |
250261
set -o pipefail
251262
./mvnw ${{ env.MAVEN_ARGS }} clean test verify -Pjacoco,jdk15ge-simple,'!jdk15ge-add-open',skip-spotless -DtrimStackTrace=false -Dmaven.test.skip=false -Dcheckstyle.skip=false -Dcheckstyle_unix.skip=false -Drat.skip=false -DembeddedZookeeperPath=${{ github.workspace }}/.tmp/zookeeper 2>&1 | tee >(grep -n -B 1 -A 200 "FAILURE! -- in" > test_errors.log)
@@ -257,18 +268,18 @@ jobs:
257268
with:
258269
token: ${{ secrets.CODECOV_TOKEN }}
259270
verbose: true
260-
flags: unit-tests
271+
flags: unit-tests-java${{ matrix.java }}
261272
env:
262273
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
263274
- name: "Upload surefire reports"
264275
uses: actions/upload-artifact@v4
265276
with:
266-
name: surefire-reports
277+
name: surefire-reports-java${{ matrix.java }}
267278
path: "**/target/surefire-reports/**"
268279

269280
samples-test-prepare:
270281
needs: check-format
271-
runs-on: ubuntu-latest
282+
runs-on: ubuntu-22.04
272283
env:
273284
JOB_COUNT: 3
274285
steps:
@@ -285,16 +296,16 @@ jobs:
285296
path: test/jobs
286297
samples-test-job:
287298
needs: [check-format, build-source, samples-test-prepare]
288-
name: "Samples Test on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
289-
runs-on: ubuntu-latest
299+
name: "Samples Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
300+
runs-on: ubuntu-22.04
290301
timeout-minutes: 90
291302
env:
292303
JAVA_VER: ${{matrix.java}}
293304
TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
294305
strategy:
295306
fail-fast: false
296307
matrix:
297-
java: [ 8, 17 ]
308+
java: [ 8, 21 ]
298309
job_id: [1,2,3]
299310
steps:
300311
- uses: actions/checkout@v4
@@ -335,7 +346,7 @@ jobs:
335346
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
336347
echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
337348
- name: "Build test image"
338-
run: cd test && bash ./build-test-image.sh
349+
run: cd test && bash -c ./build-test-image.sh
339350
- name: "Run tests"
340351
run: cd test && bash ./run-tests.sh
341352
- name: "merge jacoco result"
@@ -359,14 +370,14 @@ jobs:
359370
path: test/logs/*
360371
samples-test-result:
361372
needs: [check-format, samples-test-job]
362-
name: "Samples Test Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
373+
name: "Samples Test Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
363374
if: always()
364-
runs-on: ubuntu-latest
375+
runs-on: ubuntu-22.04
365376
env:
366377
JAVA_VER: ${{matrix.java}}
367378
strategy:
368379
matrix:
369-
java: [ 8, 17 ]
380+
java: [ 8, 21 ]
370381
steps:
371382
- uses: actions/checkout@v4
372383
with:
@@ -383,7 +394,7 @@ jobs:
383394

384395
integration-test-prepare:
385396
needs: check-format
386-
runs-on: ubuntu-latest
397+
runs-on: ubuntu-22.04
387398
env:
388399
JOB_COUNT: 3
389400
steps:
@@ -400,16 +411,16 @@ jobs:
400411
path: test/jobs
401412
integration-test-job:
402413
needs: [check-format, build-source, integration-test-prepare]
403-
name: "Integration Test on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
404-
runs-on: ubuntu-latest
414+
name: "Integration Test on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
415+
runs-on: ubuntu-22.04
405416
timeout-minutes: 90
406417
env:
407418
JAVA_VER: ${{matrix.java}}
408419
TEST_CASE_FILE: jobs/testjob_${{matrix.job_id}}.txt
409420
strategy:
410421
fail-fast: false
411422
matrix:
412-
java: [ 8, 17 ]
423+
java: [ 8, 21 ]
413424
job_id: [1,2,3]
414425
steps:
415426
- uses: actions/checkout@v4
@@ -450,7 +461,7 @@ jobs:
450461
CANDIDATE_VERSIONS="dubbo.version:$DUBBO_VERSION;compiler.version:$DUBBO_VERSION;$CANDIDATE_VERSIONS;dubbo.compiler.version:$DUBBO_VERSION"
451462
echo "CANDIDATE_VERSIONS=$CANDIDATE_VERSIONS" >> $GITHUB_ENV
452463
- name: "Build test image"
453-
run: cd test && bash ./build-test-image.sh
464+
run: cd test && bash -c ./build-test-image.sh
454465
- name: "Run tests"
455466
run: cd test && bash ./run-tests.sh
456467
- name: "merge jacoco result"
@@ -473,15 +484,15 @@ jobs:
473484
name: integration-test-logs-${{matrix.job_id}}-java${{matrix.java}}
474485
path: test/logs/*
475486
integration-test-result:
476-
name: "Integration Test Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
487+
name: "Integration Test Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
477488
needs: [check-format, integration-test-job]
478489
if: always()
479-
runs-on: ubuntu-latest
490+
runs-on: ubuntu-22.04
480491
env:
481492
JAVA_VER: ${{matrix.java}}
482493
strategy:
483494
matrix:
484-
java: [ 8, 17 ]
495+
java: [ 8, 21 ]
485496
steps:
486497
- uses: actions/checkout@v4
487498
with:
@@ -497,12 +508,12 @@ jobs:
497508
run: ./test/scripts/merge-test-results.sh
498509

499510
samples-jacoco-result-merge:
500-
name: "Samples Jacoco Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
501-
runs-on: ubuntu-latest
511+
name: "Samples Jacoco Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
512+
runs-on: ubuntu-22.04
502513
needs: [check-format, samples-test-result]
503514
strategy:
504515
matrix:
505-
java: [ 8, 17 ]
516+
java: [ 8, 21 ]
506517
steps:
507518
- uses: actions/checkout@v4
508519
- uses: actions/checkout@v4
@@ -547,12 +558,12 @@ jobs:
547558
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
548559

549560
integration-jacoco-result-merge:
550-
name: "Integration Jacoco Result on ubuntu-latest (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
551-
runs-on: ubuntu-latest
561+
name: "Integration Jacoco Result on ubuntu-22.04 (JobId: ${{matrix.job_id}} Java: ${{matrix.java}})"
562+
runs-on: ubuntu-22.04
552563
needs: [check-format, integration-test-result, samples-test-result]
553564
strategy:
554565
matrix:
555-
java: [ 8, 17 ]
566+
java: [ 8, 21 ]
556567
steps:
557568
- uses: actions/checkout@v4
558569
- uses: actions/checkout@v4
@@ -599,7 +610,7 @@ jobs:
599610

600611
error-code-inspecting:
601612
needs: check-format
602-
runs-on: ubuntu-latest
613+
runs-on: ubuntu-22.04
603614
steps:
604615
- uses: actions/checkout@v4
605616
with:
@@ -643,7 +654,7 @@ jobs:
643654

644655
native-image-inspecting:
645656
needs: check-format
646-
runs-on: ubuntu-latest
657+
runs-on: ubuntu-22.04
647658
steps:
648659
- uses: actions/checkout@v4
649660
with:
@@ -658,7 +669,7 @@ jobs:
658669
native-image-job-reports: 'true'
659670
- name: "Set up Zookeeper environment"
660671
run: |
661-
wget https://dlcdn.apache.org/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
672+
wget -t 1 -T 120 https://archive.apache.org/dist/zookeeper/zookeeper-3.8.4/apache-zookeeper-3.8.4-bin.tar.gz
662673
tar -zxvf apache-zookeeper-3.8.4-bin.tar.gz
663674
mv apache-zookeeper-3.8.4-bin/conf/zoo_sample.cfg apache-zookeeper-3.8.4-bin/conf/zoo.cfg
664675
apache-zookeeper-3.8.4-bin/bin/zkServer.sh start

0 commit comments

Comments
 (0)