From 2eccb9d157c2d3c7cb78d43eafa6a41f39979bab Mon Sep 17 00:00:00 2001
From: Simon Tzanakis <Simon.Tzanakis@europeana.eu>
Date: Tue, 30 Jul 2024 10:58:09 +0200
Subject: [PATCH] MET-5649 Update metis-actions branch from jdk21 to main

(cherry picked from commit 0217490ac6fd7c5d9d187684d4263fa5d3f4373b)
---
 .github/workflows/ci.yml      | 8 ++++----
 .github/workflows/perf.yml    | 8 ++++----
 .github/workflows/release.yml | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74bd0617..83799951 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,19 +7,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install media software
-        uses: europeana/metis-actions/actions/media-software-install-steps@jdk21
+        uses: europeana/metis-actions/actions/media-software-install-steps@main
       - name: Build code and Sonar Analyze
-        uses: europeana/metis-actions/actions/build-analyze@jdk21
+        uses: europeana/metis-actions/actions/build-analyze@main
         with:
           sonar_organization: europeana
           sonar_project_key: europeana_metis-sandbox
           sonar_token: ${{ secrets.METIS_SONAR_TOKEN }}
       - name: Upload all jars to target-jars
-        uses: europeana/metis-actions/actions/upload-target-jars@jdk21
+        uses: europeana/metis-actions/actions/upload-target-jars@main
 
   docker-build_metis-sandbox:
     needs: ci
-    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@jdk21
+    uses: europeana/metis-actions/.github/workflows/docker-build-push.yml@main
     with:
       docker-organization: europeana
       docker-image-name: metis-sandbox
diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml
index 27ff988f..d6a57b3e 100644
--- a/.github/workflows/perf.yml
+++ b/.github/workflows/perf.yml
@@ -59,14 +59,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
           distribution: 'temurin'
+          java-version: '21'
           cache: maven
       - name: Set up Jmeter 5.5
         run: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 559135d0..df5709a5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   ci-release:
-    uses: europeana/metis-actions/.github/workflows/release.yml@jdk21
+    uses: europeana/metis-actions/.github/workflows/release.yml@main
     with:
       release-version: ${{ github.event.inputs.release-version }}
       commit-hash-branch: ${{ github.event.inputs.commit-hash-branch }}