Skip to content

Commit 85352e4

Browse files
authored
Merge branch 'master' into dependabot/maven/io.netty-netty-all-4.2.16.Final
2 parents 2316f67 + ffc0530 commit 85352e4

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Dependabot Auto-Merge
22

3-
on: pull_request
3+
on: pull_request_target
44

55
permissions:
66
contents: write
@@ -10,7 +10,7 @@ jobs:
1010
dependabot:
1111
name: Enable Auto-Merge
1212
runs-on: ubuntu-latest
13-
if: github.actor == 'dependabot[bot]'
13+
if: github.event.pull_request.user.login == 'dependabot[bot]'
1414
steps:
1515
- name: Dependabot metadata
1616
id: metadata
@@ -19,7 +19,9 @@ jobs:
1919
github-token: "${{ secrets.GITHUB_TOKEN }}"
2020

2121
- name: Enable auto-merge for Dependabot PRs
22-
run: gh pr merge --auto --merge "$PR_URL"
22+
run: |
23+
gh pr review --approve "$PR_URL" || true
24+
gh pr merge --auto --merge "$PR_URL"
2325
env:
2426
PR_URL: ${{github.event.pull_request.html_url}}
2527
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<vertx.version>4.5.27</vertx.version>
9292

9393
<!-- Test Dependencies -->
94-
<junit.version>5.11.4</junit.version>
94+
<junit.version>6.1.2</junit.version>
9595
<mockito.version>5.23.0</mockito.version>
9696
<assertj.version>3.27.7</assertj.version>
9797

@@ -110,7 +110,7 @@
110110
<!-- Quality Plugin Versions -->
111111
<spotless.version>3.8.0</spotless.version>
112112
<checkstyle.version>3.6.0</checkstyle.version>
113-
<checkstyle-tool.version>10.21.4</checkstyle-tool.version>
113+
<checkstyle-tool.version>13.9.0</checkstyle-tool.version>
114114
<pmd-plugin.version>3.28.0</pmd-plugin.version>
115115
<pmd-tool.version>7.26.0</pmd-tool.version>
116116
<spotbugs.version>4.10.3.0</spotbugs.version>
@@ -450,7 +450,7 @@
450450
<dependency>
451451
<groupId>org.ow2.asm</groupId>
452452
<artifactId>asm</artifactId>
453-
<version>9.7.1</version>
453+
<version>9.10.1</version>
454454
</dependency>
455455
</dependencies>
456456
<configuration>

0 commit comments

Comments
 (0)