From 48beceb90d232223089da588bdfc06dd7a7161c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Wed, 6 Nov 2024 14:05:45 +0100
Subject: [PATCH 01/12] using new JRE capabilities of adoptium aqa-tests

---
 testHeadlessComponents.sh | 49 ++++++---------------------------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/testHeadlessComponents.sh b/testHeadlessComponents.sh
index efd47b6..6d65830 100755
--- a/testHeadlessComponents.sh
+++ b/testHeadlessComponents.sh
@@ -42,45 +42,6 @@ else
     exit 1
 fi
 
-function unwrap_file_to_location() {
-  if [ "$OS" == "mac" -o "$OS" == "linux" ]; then
-    tar --strip-components=1 -xf $1 -C $2
-  elif [ "$OS" == "windows" ]; then
-    unzip $1 -d $2
-    # Get the name of the extracted folder (assuming only one folder is present)
-    ls $2
-    extracted_folder_name=$(ls $2)
-
-    # Ensure only one folder is found
-    if [ "$(ls $2 | wc -l)" -eq 1 ]; then
-        # Move the contents to the desired destination without creating a new directory
-        mv "$2/$extracted_folder_name"/* "$2"
-    else
-        echo "Error: More than one directory found in $2."
-    fi
-  fi
-}
-
-function installAlternativeJDK() {
-  ARCH=$( uname -m )
-  if [ "x$BOOTJDK_DIR" == "x" ]; then
-    BOOTJDK_DIR=~/bootjdk
-  fi
-  if [ "x$BOOTJDK_ARCHIVE_DIR" == "x" ]; then
-    BOOTJDK_ARCHIVE_DIR=$WORKSPACE/bootjdkarchive
-    mkdir -p $BOOTJDK_ARCHIVE_DIR
-    cd $BOOTJDK_ARCHIVE_DIR
-    curl -OLJks "https://api.adoptopenjdk.net/v3/binary/latest/$OJDK_VERSION_NUMBER/ga/$OS/$ARCH/jdk/hotspot/normal/adoptopenjdk"
-    rm -rf ${BOOTJDK_DIR}
-    mkdir -p ${BOOTJDK_DIR}
-    unwrap_file_to_location ${BOOTJDK_ARCHIVE_DIR}/* ${BOOTJDK_DIR}
-  else
-    rm -rf ${BOOTJDK_DIR}
-    mkdir -p ${BOOTJDK_DIR}
-    ls ${BOOTJDK_ARCHIVE_DIR}
-    unwrap_file_to_location ${BOOTJDK_ARCHIVE_DIR}/*${ARCH}.tarxz ${BOOTJDK_DIR}
-  fi
-}
 
 function run_java_with_headless {
   COMPONENTS_TO_TEST=$2
@@ -174,12 +135,16 @@ LOGFILE=$TMPRESULTS/testHeadlessComponent.log
 
 installAlternativeJDK
 
-JAVAC_BINARY="${BOOTJDK_DIR}/bin/javac"
-if [ "$OS" == "mac" ]; then
+#JAVA_COMMAND always contains link to the java from the SDK
+
+JAVAC_BINARY="${JAVA_COMMAND}c"
+if [ "$OS" == "mac1" ]; then
   JAVAC_BINARY="${BOOTJDK_DIR}/Contents/Home/bin/javac"
 fi
 
-#use bootjdk javac
+#JAVA_TO_TEST can contain either link to SDK or JRE java, however always the java that we want to test with
+JAVA=$JAVA_TO_TEST
+
 #other classes depend on this one, so we might as well just compile the main class
 cp -r $SCRIPT_DIR/testHeadlessComponents $WORKSPACE
 ls $WORKSPACE

From e073f546fa538841a989839f6287697144dd35d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 16:15:43 +0100
Subject: [PATCH 02/12] fixing git actions

---
 .github/workflows/test.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4c793a4..bcd7a41 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -39,7 +39,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -79,7 +79,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -126,7 +126,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -174,7 +174,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -230,7 +230,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -288,7 +288,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" WORKSPACE=/Users/runner/workspace
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}

From a0a41a0dea1a6b10914b76e863b325d7dae0ad36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 16:24:27 +0100
Subject: [PATCH 03/12] fixing github actions 2

---
 .github/workflows/test.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index bcd7a41..c4bf49f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -39,7 +39,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -79,7 +79,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -126,7 +126,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -174,7 +174,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -230,7 +230,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -288,7 +288,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="$(JAVA_HOME)/bin/java" JAVA_COMMAND="$(JAVA_HOME)/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}

From 044164eb02214bef8c2fdecc47c93ae83b6e0be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 16:33:18 +0100
Subject: [PATCH 04/12] fixing github actions 3

---
 .github/workflows/test.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c4bf49f..3e66cdc 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -39,7 +39,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" JAVA_TO_TEST=java JAVA_COMMAND=java
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -79,7 +79,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST=java JAVA_COMMAND=java
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -126,7 +126,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST=java JAVA_COMMAND=java
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -174,7 +174,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST=java JAVA_COMMAND=java
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -230,7 +230,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST=java JAVA_COMMAND=java
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -288,7 +288,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST=java JAVA_COMMAND=java
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}

From eaa530068adae6afe994ba095075e890ac94b315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 16:35:05 +0100
Subject: [PATCH 05/12] forgotten call of legacy function

---
 testHeadlessComponents.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/testHeadlessComponents.sh b/testHeadlessComponents.sh
index 6d65830..98dfb8e 100755
--- a/testHeadlessComponents.sh
+++ b/testHeadlessComponents.sh
@@ -133,8 +133,6 @@ popd
 
 LOGFILE=$TMPRESULTS/testHeadlessComponent.log
 
-installAlternativeJDK
-
 #JAVA_COMMAND always contains link to the java from the SDK
 
 JAVAC_BINARY="${JAVA_COMMAND}c"

From fba4a6e8d87896781114c2404d707144b1640853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 16:44:43 +0100
Subject: [PATCH 06/12] fixing github actions 4

---
 .github/workflows/test.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 3e66cdc..c4bf49f 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -39,7 +39,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" JAVA_TO_TEST=java JAVA_COMMAND=java
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jdk" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -79,7 +79,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST=java JAVA_COMMAND=java
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -126,7 +126,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST=java JAVA_COMMAND=java
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -174,7 +174,7 @@ jobs:
       - name: Run
         shell: msys2 {0}
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST=java JAVA_COMMAND=java
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           ./testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -230,7 +230,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST=java JAVA_COMMAND=java
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
@@ -288,7 +288,7 @@ jobs:
           java-version: ${{ matrix.jdkver || env.jdkver_latest }}
       - name: Run
         run: | 
-          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST=java JAVA_COMMAND=java
+          export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
           /usr/local/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}

From 3b6fcd0081c2d95605bfae93940033b7e3ecd38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 16:54:52 +0100
Subject: [PATCH 07/12] fixing github actions 5

---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c4bf49f..4ece4f8 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -279,7 +279,7 @@ jobs:
         run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
   
       - name: Verify Bash Version
-        run: /usr/local/bin/bash --version
+        run: /bin/bash --version
 
       - name: Set up JDK
         uses: actions/setup-java@v3

From 6d14e12353bfe8bfb03a6c9cf2226ec1b20ef38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 16:56:50 +0100
Subject: [PATCH 08/12] fixing github actions 6

---
 .github/workflows/test.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4ece4f8..43d6fe8 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -289,7 +289,7 @@ jobs:
       - name: Run
         run: | 
           export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
-          /usr/local/bin/bash testHeadlessComponents.sh
+          /bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
         run: |

From a61b1e2de912acff46f82e30278547a1ca8984ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 17:02:49 +0100
Subject: [PATCH 09/12] fixing github actions 7

---
 .github/workflows/test.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 43d6fe8..b9ffccb 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -221,7 +221,7 @@ jobs:
         run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
   
       - name: Verify Bash Version
-        run: /usr/local/bin/bash --version
+        run: /opt/homebrew/Cellar/bash/5.2.37/bash --version
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -231,7 +231,7 @@ jobs:
       - name: Run
         run: | 
           export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
-          /usr/local/bin/bash testHeadlessComponents.sh
+          /opt/homebrew/Cellar/bash/5.2.37/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
         run: |
@@ -279,7 +279,7 @@ jobs:
         run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
   
       - name: Verify Bash Version
-        run: /bin/bash --version
+        run: /opt/homebrew/Cellar/bash --version
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -289,7 +289,7 @@ jobs:
       - name: Run
         run: | 
           export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
-          /bin/bash testHeadlessComponents.sh
+          /opt/homebrew/Cellar/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
         run: |

From 219101572153a79f49e44f84020ba9d3c7290513 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 17:07:23 +0100
Subject: [PATCH 10/12] fixing github actions 7

---
 .github/workflows/test.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index b9ffccb..431a14e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -221,7 +221,7 @@ jobs:
         run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
   
       - name: Verify Bash Version
-        run: /opt/homebrew/Cellar/bash/5.2.37/bash --version
+        run: /opt/homebrew/Cellar/bash/5.2.37/bin/bash --version
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -231,7 +231,7 @@ jobs:
       - name: Run
         run: | 
           export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} BOOTJDK_DIR=~/bootjdk JREJDK="jre" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
-          /opt/homebrew/Cellar/bash/5.2.37/bash testHeadlessComponents.sh
+          /opt/homebrew/Cellar/bash/5.2.37/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
         run: |
@@ -279,7 +279,7 @@ jobs:
         run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
   
       - name: Verify Bash Version
-        run: /opt/homebrew/Cellar/bash --version
+        run: /opt/homebrew/Cellar/bash/bin/bash --version
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -289,7 +289,7 @@ jobs:
       - name: Run
         run: | 
           export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
-          /opt/homebrew/Cellar/bash testHeadlessComponents.sh
+          /opt/homebrew/Cellar/bash/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
         run: |

From 6a4f4b8d363e74f2d27947966bb15cf25e56d472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 17:11:33 +0100
Subject: [PATCH 11/12] fixing github actions 9

---
 .github/workflows/test.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 431a14e..c346d15 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -279,7 +279,7 @@ jobs:
         run: echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.zprofile && exec -l $SHELL
   
       - name: Verify Bash Version
-        run: /opt/homebrew/Cellar/bash/bin/bash --version
+        run: /opt/homebrew/Cellar/bash/5.2.37/bin/bash --version
 
       - name: Set up JDK
         uses: actions/setup-java@v3
@@ -289,7 +289,7 @@ jobs:
       - name: Run
         run: | 
           export OJDK_VERSION_NUMBER=${{ matrix.jdkver || env.jdkver_latest }} JREJDK="jdk" WORKSPACE=/Users/runner/workspace JAVA_TO_TEST="${JAVA_HOME}/bin/java" JAVA_COMMAND="${JAVA_HOME}/bin/java"
-          /opt/homebrew/Cellar/bash/bin/bash testHeadlessComponents.sh
+          /opt/homebrew/Cellar/bash/5.2.37/bin/bash testHeadlessComponents.sh
       - name: Pack results
         if: ${{ always() }}
         run: |

From f393398e31521f4292bbe3520215adb7804b7e06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Andrl=C3=ADk?= <jandrlik@redhat.com>
Date: Fri, 15 Nov 2024 17:12:17 +0100
Subject: [PATCH 12/12] fixing github actions 10

---
 .github/workflows/test.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c346d15..456b711 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -200,8 +200,6 @@ jobs:
           - JDK 17
           - JDK Latest
         include:
-          - jdkconf: JDK 8
-            jdkver: "8"
           - jdkconf: JDK 11
             jdkver: "11"
           - jdkconf: JDK 17
@@ -258,8 +256,6 @@ jobs:
           - JDK 17
           - JDK Latest
         include:
-          - jdkconf: JDK 8
-            jdkver: "8"
           - jdkconf: JDK 11
             jdkver: "11"
           - jdkconf: JDK 17