keycloak/trunk/pin-java-version.patch

   1 From 24fd4d17d97bfa28971ce980c76ebbf420fb9439 Mon Sep 17 00:00:00 2001
   2 From: Frederik Schwan <frederik.schwan@linux.com>
   3 Date: Tue, 1 Nov 2022 18:14:03 +0100
   4 Subject: [PATCH] Pin Java version
   5
   6 Inject JAVA_HOME and JAVA variables into scripts that end up in /usr/bin
   7 to also pin the java version for the cli tools that otherwise would use
   8 the default system JAVA_HOME and JAVA var.
   9 ---
  10  integration/client-cli/admin-cli/src/main/bin/kcadm.sh           | 1 +
  11  .../client-cli/client-registration-cli/src/main/bin/kcreg.sh     | 1 +
  12  quarkus/dist/src/main/content/bin/kc.sh                          | 1 +
  13  3 files changed, 3 insertions(+)
  14
  15 diff --git a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh
  16 index 60a9e05f5c..0cdd597cd6 100755
  17 --- a/integration/client-cli/admin-cli/src/main/bin/kcadm.sh
  18 +++ b/integration/client-cli/admin-cli/src/main/bin/kcadm.sh
  19 @@ -20,6 +20,7 @@ if [ "x$RESOLVED_NAME" = "x" ]; then
  20  fi
  21
  22  DIRNAME=`dirname "$RESOLVED_NAME"`
  23 +. "$DIRNAME/common.sh"
  24
  25  if [ "x$JAVA" = "x" ]; then
  26      if [ "x$JAVA_HOME" != "x" ]; then
  27 diff --git a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh
  28 index ce85fb5710..bab287e9b7 100755
  29 --- a/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh
  30 +++ b/integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh
  31 @@ -20,6 +20,7 @@ if [ "x$RESOLVED_NAME" = "x" ]; then
  32  fi
  33
  34  if [ "x$JAVA" = "x" ]; then
  35 +. "$DIRNAME/common.sh"
  36      if [ "x$JAVA_HOME" != "x" ]; then
  37          JAVA="$JAVA_HOME/bin/java"
  38      else
  39 diff --git a/quarkus/dist/src/main/content/bin/kc.sh b/quarkus/dist/src/main/content/bin/kc.sh
  40 index d7be862cde..fdef64d707 100644
  41 --- a/quarkus/dist/src/main/content/bin/kc.sh
  42 +++ b/quarkus/dist/src/main/content/bin/kc.sh
  43 @@ -23,6 +23,7 @@ fi
  44
  45  GREP="grep"
  46  DIRNAME="$(dirname "$RESOLVED_NAME")"
  47 +. "$DIRNAME/common.sh"
  48
  49  abs_path () {
  50    if [ -z $IS_CYGWIN ] ; then
  51 --
  52 2.38.1
  53