Skip to content

Commit f48074f

Browse files
authored
Merge branch 'main' into dependabot/maven/error_prone_core.version-2.49.0
2 parents 2cd2d5a + 09038fb commit f48074f

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

.github/workflows/comment_bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
if: github.event.comment.body == 'take'
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/github-script@v8
33+
- uses: actions/github-script@v9
3434
with:
3535
github-token: ${{ secrets.GITHUB_TOKEN }}
3636
script: |-

.github/workflows/dev_pr.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,28 +50,28 @@ jobs:
5050

5151
- name: Ensure PR title format
5252
id: title-format
53-
uses: actions/github-script@v8
53+
uses: actions/github-script@v9
5454
with:
5555
script: |
5656
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
5757
return scripts.check_title_format({core, github, context});
5858
5959
- name: Label PR
60-
uses: actions/github-script@v8
60+
uses: actions/github-script@v9
6161
with:
6262
script: |
6363
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
6464
await scripts.apply_labels({core, github, context});
6565
6666
- name: Ensure PR is labeled
67-
uses: actions/github-script@v8
67+
uses: actions/github-script@v9
6868
with:
6969
script: |
7070
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);
7171
await scripts.check_labels({core, github, context});
7272
7373
- name: Ensure PR is linked to an issue
74-
uses: actions/github-script@v8
74+
uses: actions/github-script@v9
7575
with:
7676
script: |
7777
const scripts = require(`${process.env.GITHUB_WORKSPACE}/.github/workflows/dev_pr.js`);

.github/workflows/rc.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: |
7272
dev/release/run_rat.sh "${TAR_GZ}"
7373
- name: Upload source archive
74-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
74+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7575
with:
7676
name: release-source
7777
path: |
@@ -148,7 +148,7 @@ jobs:
148148
- name: Compress into single artifact to keep directory structure
149149
run: tar -cvzf jni-linux-${{ matrix.platform.arch }}.tar.gz jni/
150150
- name: Upload artifacts
151-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
151+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
152152
with:
153153
name: jni-linux-${{ matrix.platform.arch }}
154154
path: jni-linux-${{ matrix.platform.arch }}.tar.gz
@@ -278,7 +278,7 @@ jobs:
278278
- name: Compress into single artifact to keep directory structure
279279
run: tar -cvzf jni-macos-${{ matrix.platform.arch }}.tar.gz jni/
280280
- name: Upload artifacts
281-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
281+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
282282
with:
283283
name: jni-macos-${{ matrix.platform.arch }}
284284
path: jni-macos-${{ matrix.platform.arch }}.tar.gz
@@ -356,7 +356,7 @@ jobs:
356356
shell: bash
357357
run: tar -cvzf jni-windows-${{ matrix.platform.arch }}.tar.gz jni/
358358
- name: Upload artifacts
359-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
359+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
360360
with:
361361
name: jni-windows-${{ matrix.platform.arch }}
362362
path: jni-windows-${{ matrix.platform.arch }}.tar.gz
@@ -428,12 +428,12 @@ jobs:
428428
cp -a target/site/apidocs reference
429429
tar -cvzf reference.tar.gz reference
430430
- name: Upload binaries
431-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
431+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
432432
with:
433433
name: release-binaries
434434
path: binaries/*
435435
- name: Upload docs
436-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
436+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
437437
with:
438438
name: reference
439439
path: reference.tar.gz
@@ -471,7 +471,7 @@ jobs:
471471
- name: Compress into single artifact to keep directory structure
472472
run: tar -cvzf html.tar.gz -C docs/build html
473473
- name: Upload artifacts
474-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
474+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
475475
with:
476476
name: release-html
477477
path: html.tar.gz

flight/flight-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ under the License.
134134
<dependency>
135135
<groupId>com.google.api.grpc</groupId>
136136
<artifactId>proto-google-common-protos</artifactId>
137-
<version>2.67.0</version>
137+
<version>2.70.0</version>
138138
<scope>test</scope>
139139
</dependency>
140140
<dependency>

flight/flight-sql-jdbc-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ under the License.
165165
<dependency>
166166
<groupId>org.bouncycastle</groupId>
167167
<artifactId>bcpkix-jdk18on</artifactId>
168-
<version>1.83</version>
168+
<version>1.84</version>
169169
</dependency>
170170

171171
<dependency>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ under the License.
9797
<dep.junit.platform.version>1.9.0</dep.junit.platform.version>
9898
<dep.junit.jupiter.version>5.12.2</dep.junit.jupiter.version>
9999
<dep.slf4j.version>2.0.17</dep.slf4j.version>
100-
<dep.guava-bom.version>33.5.0-jre</dep.guava-bom.version>
100+
<dep.guava-bom.version>33.6.0-jre</dep.guava-bom.version>
101101
<dep.netty-bom.version>4.2.12.Final</dep.netty-bom.version>
102102
<dep.grpc-bom.version>1.79.0</dep.grpc-bom.version>
103103
<dep.protobuf-bom.version>4.34.1</dep.protobuf-bom.version>
@@ -112,7 +112,7 @@ under the License.
112112
<checkstyle.version>10.23.0</checkstyle.version>
113113
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
114114
<error_prone_core.version>2.49.0</error_prone_core.version>
115-
<checker.framework.version>3.55.1</checker.framework.version>
115+
<checker.framework.version>4.0.0</checker.framework.version>
116116
<logback.version>1.5.32</logback.version>
117117
<doclint>none</doclint>
118118
<additionalparam>-Xdoclint:none</additionalparam>

0 commit comments

Comments
 (0)