[BRMO-370] Update Maven runtime, drop windows CI workflow (#2237)

* [BRMO-370] verwijder Windows CI workflow * [BRMO-370] Update Maven versie in workflows naar 3.9.9 * Voeg een workflow toe om Maven plugin updates automatisch te mergen
B3Partners · Sep 5, 2024 · b8fe993 · b8fe993
1 parent 00c7e63
commit b8fe993
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 95 deletions.
diff --git a/.github/workflows/cleanup_and_maintainance.yml b/.github/workflows/cleanup_and_maintainance.yml
@@ -102,20 +102,6 @@ jobs:
           prune-untagged: true
 
 
-#  workflows:
-#    runs-on: ubuntu-latest
-#    name: "Cleanup old workflow runs"
-#    steps:
-#      - name: Delete workflow runs
-#        uses: Mattraks/delete-workflow-runs@v2
-#        with:
-#          token: ${{ github.token }}
-#          repository: ${{ github.repository }}
-#          retain_days: 60
-#          keep_minimum_runs: 0
-#          delete_workflow_pattern: 'all'
-
-
   otherworkflows:
     runs-on: ubuntu-latest
     name: "Cleanup all old workflow runs"

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -11,6 +11,9 @@ on:
   schedule:
     - cron: '0 22 * * 6'
 
+env:
+  MAVEN_VERSION: '3.9.9'
+
 jobs:
   analyze:
     name: 'Analyze'
@@ -60,7 +63,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'Build'
         run: |

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -0,0 +1,23 @@
+name: 'Dependabot auto-merge'
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'B3Partners/brmo'
+    steps:
+      - name: 'Dependabot metadata'
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: 'Enable auto-merge for Dependabot PRs on Maven plugins'
+        if: contains(steps.metadata.outputs.dependency-names, 'maven-') && steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/linux-oracle.yml b/.github/workflows/linux-oracle.yml
@@ -13,6 +13,7 @@ concurrency: # cancel on PR pushes
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true -Xms8G -Xmx12G -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dtest.persistence.unit=brmo.persistence.oracle -Djava.security.egd=file:/dev/./urandom
+  MAVEN_VERSION: '3.9.9'
 
 jobs:
   build:
@@ -48,7 +49,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'Install extra software'
         run: sudo apt install -y --no-install-recommends xmlstarlet

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -16,6 +16,7 @@ env:
   PGPASSWORD: postgres
   PGUSER: postgres
   PGDATABASE: postgres
+  MAVEN_VERSION: '3.9.9'
 
 jobs:
   build:
@@ -28,11 +29,11 @@ jobs:
         java-dist: [ 'temurin' ]
         # docker image tags from https://hub.docker.com/r/postgis/postgis/tags?page=1&ordering=last_updated
         # zie ook https://www.postgresql.org/support/versioning/
-        postgis: 
-            # t/m november 2024
-            - 12-3.4-alpine
-            - 15-3.4-alpine
-            - 16-3.4-alpine
+        postgis:
+          # t/m november 2024
+          - 12-3.4-alpine
+          - 15-3.4-alpine
+          - 16-3.4-alpine
         include:
           - java: 21
             java-dist: 'temurin'
@@ -61,7 +62,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'Install extra software'
         run: sudo apt install -y --no-install-recommends xmlstarlet
@@ -144,7 +145,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'Javadoc'
         run: mvn compile javadoc:javadoc -DskipQA=true
@@ -189,7 +190,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'QA build with Maven'
         run: mvn -B -V -fae -DskipQA=false -Dfmt.action=check -Dpom.fmt.action=verify -Ddocker.skip=true -Dtest.onlyITs= -Dmaven.test.skip=true clean package
@@ -198,7 +199,7 @@ jobs:
   deploy:
     name: 'Deploy docker images'
     if: ${{ github.repository == 'B3Partners/brmo' && github.ref == 'refs/heads/master' && github.event_name == 'push' }}
-    needs: [build, qacheck]
+    needs: [ build, qacheck ]
     runs-on: ubuntu-22.04
     permissions:
       contents: read
@@ -221,7 +222,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'Build and Push docker images'
         env:

diff --git a/.github/workflows/owasp-dependency-check.yml b/.github/workflows/owasp-dependency-check.yml
@@ -1,5 +1,8 @@
 name: 'OWASP dependency check'
 
+env:
+  MAVEN_VERSION: '3.9.9'
+
 on:
   pull_request:
   workflow_dispatch:
@@ -23,7 +26,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'Run Check'
         continue-on-error: true

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -6,6 +6,9 @@ on:
     - cron: "17 23 * * 0"
   workflow_dispatch:
 
+env:
+  MAVEN_VERSION: '3.9.9'
+
 jobs:
   build:
     name: "Trivy Scan ${{ matrix.docker-image }}"
@@ -33,7 +36,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: "Build Java ${{ matrix.java }}"
         run: mvn -U package -Dmaven.test.skip=true -Ddocker.skip=true -Dtest.onlyITs= -DskipQA=true -Dmaven.javadoc.skip=true

diff --git a/.github/workflows/upgrade-oracle.yml b/.github/workflows/upgrade-oracle.yml
@@ -2,8 +2,8 @@ name: Oracle Database Upgrade
 
 on:
   push:
-      branches:
-        - 'master'
+    branches:
+      - 'master'
   pull_request:
 
 concurrency: # cancel on PR pushes
@@ -13,6 +13,7 @@ concurrency: # cancel on PR pushes
 
 env:
   MAVEN_OPTS: -Djava.awt.headless=true -Xms8G -Xmx12G -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Dtest.persistence.unit=brmo.persistence.oracle
+  MAVEN_VERSION: '3.9.9'
 
 jobs:
   build:
@@ -42,7 +43,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'datamodel Priming build'
         run: |

diff --git a/.github/workflows/upgrade-pgsql.yml b/.github/workflows/upgrade-pgsql.yml
@@ -16,6 +16,7 @@ env:
   PGPASSWORD: postgres
   PGUSER: postgres
   PGDATABASE: postgres
+  MAVEN_VERSION: '3.9.9'
 
 jobs:
   build:
@@ -59,7 +60,7 @@ jobs:
       - name: 'Set up Maven'
         uses: stCarolas/setup-maven@v5
         with:
-          maven-version: '3.9.8'
+          maven-version: ${{ env.MAVEN_VERSION }}
 
       - name: 'datamodel Priming build'
         run: mvn clean install -Dmaven.test.skip=true -Ddocker.skip=true -Dtest.onlyITs= -B -V -fae -pl 'datamodel' -am -DskipQA=true

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml