From cfe16d45da34e8dfe5fc4605a23bcbff53414073 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2026 22:43:32 +0000
Subject: [PATCH 1/2] Bump org.mariadb.jdbc:mariadb-java-client from 3.5.7 to
 3.5.9 in /server

Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.5.7 to 3.5.9.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.5.7...3.5.9)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-version: 3.5.9
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 server/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/pom.xml b/server/pom.xml
index e2532415..481b458a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.5.7</version>
+            <version>3.5.9</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.retry</groupId>

From b75356b9140f6aa762ebfb1dd953b9d696eb65ac Mon Sep 17 00:00:00 2001
From: Peter Havekes <peter@havekes.eu>
Date: Mon, 31 Aug 2026 16:39:56 +0200
Subject: [PATCH 2/2] Use java temurin in gha

---
 .github/workflows/actions.yml | 2 +-
 .github/workflows/codeql.yml  | 2 +-
 .github/workflows/doc.yml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index f3825837..8dda4e5f 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -44,7 +44,7 @@ jobs:
         uses: actions/setup-java@v6
         with:
           java-version: '21'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'maven'
       - name: Set up MySQL
         uses: shogo82148/actions-setup-mysql@v1
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e940d496..11122b92 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -65,7 +65,7 @@ jobs:
         uses: actions/setup-java@v6
         with:
           java-version: '21'
-          distribution: 'adopt'
+          distribution: 'temurin'
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
index 05a30c11..091b637c 100644
--- a/.github/workflows/doc.yml
+++ b/.github/workflows/doc.yml
@@ -45,7 +45,7 @@ jobs:
         uses: actions/setup-java@v6
         with:
           java-version: '21'
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: 'maven'
         if: ${{ steps.changes.outputs.server == 'true' ||  github.event_name == 'workflow_dispatch' }}
       - name: Set up MySQL