Skip to content

Commit 02efeaa

Browse files
authored
Merge branch 'apache:master' into multimap-streaming
2 parents 07e7412 + 89947fd commit 02efeaa

File tree

707 files changed

+34447
-8956
lines changed

Some content is hidden

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

707 files changed

+34447
-8956
lines changed

.asf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ github:
5151

5252
protected_branches:
5353
master: {}
54+
release-2.69.0-postrelease: {}
55+
release-2.69: {}
5456
release-2.68.0-postrelease: {}
5557
release-2.68: {}
5658
release-2.67.0-postrelease: {}

.github/REVIEWERS.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ labels:
2323
- jrmccluskey
2424
- lostluck
2525
- shunping
26+
- liferoad
2627
exclusionList: []
2728
- name: Python
2829
reviewers:
@@ -40,7 +41,6 @@ labels:
4041
- chamikaramj
4142
- m-trieu
4243
- kennknowles
43-
- robertwb
4444
exclusionList: []
4545
- name: spanner
4646
reviewers:
@@ -75,6 +75,5 @@ fallbackReviewers:
7575
- jrmccluskey
7676
- kennknowles
7777
- liferoad
78-
- robertwb
7978
- shunping
8079
- tvalentyn

.github/actions/gradle-command-self-hosted-action/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ runs:
4141
if [ -f ~/.m2/settings.xml ]; then
4242
rm ~/.m2/settings.xml
4343
fi
44-
./gradlew ${{ inputs.gradle-command }} --max-workers=${{ inputs.max-workers }} --continue \
44+
./gradlew ${{ inputs.gradle-command }} --max-workers=${{ inputs.max-workers }} --continue --no-daemon \
4545
-Dorg.gradle.jvmargs=-Xms2g -Dorg.gradle.jvmargs=-Xmx6g -Dorg.gradle.vfs.watch=false -Pdocker-pull-licenses \
4646
${{ inputs.arguments }}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"PythonTestProperties": {
3-
"ALL_SUPPORTED_VERSIONS": ["3.9", "3.10", "3.11", "3.12"],
3+
"ALL_SUPPORTED_VERSIONS": ["3.9", "3.10", "3.11", "3.12", "3.13"],
44
"LOWEST_SUPPORTED": ["3.9"],
5-
"HIGHEST_SUPPORTED": ["3.12"],
5+
"HIGHEST_SUPPORTED": ["3.13"],
66
"ESSENTIAL_VERSIONS": ["3.9", "3.12"],
7-
"CROSS_LANGUAGE_VALIDATES_RUNNER_PYTHON_VERSIONS": ["3.9", "3.12"],
7+
"CROSS_LANGUAGE_VALIDATES_RUNNER_PYTHON_VERSIONS": ["3.9", "3.12", "3.13"],
88
"CROSS_LANGUAGE_VALIDATES_RUNNER_DATAFLOW_USING_SQL_PYTHON_VERSIONS": ["3.11"],
9-
"VALIDATES_CONTAINER_DATAFLOW_PYTHON_VERSIONS": ["3.9", "3.10", "3.11", "3.12"],
9+
"VALIDATES_CONTAINER_DATAFLOW_PYTHON_VERSIONS": ["3.9", "3.10", "3.11", "3.12", "3.13"],
1010
"LOAD_TEST_PYTHON_VERSION": "3.9",
1111
"CHICAGO_TAXI_EXAMPLE_FLINK_PYTHON_VERSION": "3.9",
1212
"DEFAULT_INTERPRETER": "python3.9",
@@ -18,6 +18,6 @@
1818
"SPARK_VERSIONS": ["2", "3"]
1919
},
2020
"GoTestProperties": {
21-
"SUPPORTED_VERSIONS": ["1.23"]
21+
"SUPPORTED_VERSIONS": ["1.25"]
2222
}
2323
}

.github/actions/setup-environment-action/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ runs:
8181
cache-disabled: ${{ inputs.disable-cache }}
8282
- name: Install Go
8383
if: ${{ inputs.go-version != '' }}
84-
uses: actions/setup-go@v5
84+
uses: actions/setup-go@v6
8585
with:
86-
go-version: ${{ inputs.go-version == 'default' && '1.24' || inputs.go-version }} # never set patch, to get latest patch releases.
86+
go-version: ${{ inputs.go-version == 'default' && '1.25' || inputs.go-version }} # never set patch, to get latest patch releases.
8787
cache-dependency-path: $${{ inputs.disable-cache && '' || 'sdks/go.sum' }}

.github/gh-actions-self-hosted-runners/arc/images/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN curl -OL https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.xz &&
3131
mv /usr/local/node-v22.14.0-linux-x64 /usr/local/node
3232
ENV PATH="${PATH}:/usr/local/node/bin"
3333
#Install Go
34-
ARG go_version=1.24.0
34+
ARG go_version=1.25.2
3535
RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \
3636
tar -C /usr/local -xzf go${go_version}.linux-amd64.tar.gz && \
3737
rm go${go_version}.linux-amd64.tar.gz
@@ -69,7 +69,7 @@ RUN curl -OL https://dl.k8s.io/release/v1.28.1/bin/linux/amd64/kubectl && \
6969
chmod +x ./kubectl && \
7070
mv ./kubectl /usr/local/bin/kubectl
7171
#Install Apache Maven
72-
RUN curl -OL https://dlcdn.apache.org/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz && \
72+
RUN curl -OL https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.tar.gz && \
7373
tar -xvf apache-maven-3.9.4-bin.tar.gz && \
7474
rm apache-maven-3.9.4-bin.tar.gz && \
7575
mv apache-maven-3.9.4 /usr/local/maven
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run.",
3-
"modification": 2
3+
"modification": 3
44
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"comment": "Modify this file in a trivial way to cause this test suite to run",
3+
"modification": 1,
4+
"https://github.com/apache/beam/pull/36527": "skip a processing time timer test in spark",
5+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"comment": "Modify this file in a trivial way to cause this test suite to run",
3-
"modification": 1
3+
"modification": 4
44
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"https://github.com/apache/beam/pull/36138": "Cleanly separating v1 worker and v2 sdk harness container image handling",
3+
"https://github.com/apache/beam/pull/34902": "Introducing OutputBuilder",
34
"https://github.com/apache/beam/pull/35177": "Introducing WindowedValueReceiver to runners",
45
"comment": "Modify this file in a trivial way to cause this test suite to run",
5-
"modification": 1,
6+
"modification": 4,
67
"https://github.com/apache/beam/pull/35159": "moving WindowedValue and making an interface"
78
}

0 commit comments

Comments
 (0)