From cd2a4eb4097b515ff09d07138c920ca1166fd916 Mon Sep 17 00:00:00 2001
From: Julien Cherry <6952800+juliencherry@users.noreply.github.com>
Date: Wed, 16 Apr 2025 17:33:49 -0400
Subject: [PATCH 1/2] COMN-378: Give GitHub token permission to approve and
auto-merge pull requests
---
.github/workflows/dependabot-automerge.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
index d4854f8..734d9c0 100644
--- a/.github/workflows/dependabot-automerge.yml
+++ b/.github/workflows/dependabot-automerge.yml
@@ -1,5 +1,9 @@
name: Dependabot automerge
on: pull_request
+
+permissions:
+ pull-requests: write
+
jobs:
dependabot:
runs-on: ubuntu-latest
From e9cd6ec3eb5539d9028d0f77526a5a4ad5ad49b6 Mon Sep 17 00:00:00 2001
From: Julien Cherry <6952800+juliencherry@users.noreply.github.com>
Date: Wed, 16 Apr 2025 17:35:08 -0400
Subject: [PATCH 2/2] COMN-378: Temporarily downgrade Mockito
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4ec6d68..7ce383b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
org.mockito
mockito-core
- 5.17.0
+ 5.16.0
test