Merge pull request #72 from secure-software-engineering/test/dependabot-ci

test/dependabot-ci

Author: swissiety

.github/workflows/dependabot.yml

@@ -0,0 +1,21 @@
+name: Handle Dependabot PRs
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  ApproveAndMerge:
+    name: Auto approve Dependabot PRs
+    runs-on: ubuntu-latest
+    # Only run for PRs created by Dependabot - extended verification is done in the reusable workflow
+    if: github.actor == 'dependabot[bot]'
+    # These permissions are needed to approve pull requests
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Auto approve Dependabot PR
+        uses: secure-software-engineering/actions/dependabot@develop
+        with:
+          token: ${{ secrets.AUTO_MERGE_PAT }}

.github/workflows/zombie-mode.yml

@@ -1,23 +1,9 @@
 name: Zombie Mode
 on:
-  pull_request:
-    types: [opened]
-    branches: [develop]
   schedule:
-    - cron: '0 6 * * MON'
-  workflow_dispatch:
+    - cron: '0 6 * * 1-5'
 
 jobs:
-  auto-approve-dependabot:
-    if: github.actor == 'dependabot[bot]'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - uses: secure-software-engineering/actions/dependabot@develop
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
   zombie-release:
     runs-on: ubuntu-latest
     permissions:
@@ -26,10 +12,11 @@ jobs:
     steps:
       - uses: secure-software-engineering/actions/zombie-mode/prepare-pr@develop
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          base-branch: 'develop'
-          auto-merge-days: '3'
-          version-file: 'pom.xml'
+          github-token: ${{secrets.AUTO_MERGE_PAT}}
+          base-branch: develop
+          merge-timeout-days: 3
+          version-file: pom.xml
+
 
   auto-merge-aged:
     runs-on: ubuntu-latest
@@ -39,8 +26,8 @@ jobs:
     steps:
       - uses: secure-software-engineering/actions/zombie-mode/merge-pr@develop
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          age-days: '3'
-          merge-method: 'squash'
-          delete-branch: 'true'
-          zombie-label: 'zombie-mode'
+          github-token: ${{secrets.AUTO_MERGE_PAT}}
+          merge-timeout-days: 3
+          merge-method: squash
+          delete-branch: true
+          label: zombie-mode

pom.xml

@@ -135,7 +135,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.13.2</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>