From 6bd0512205afe17428240b2de1c8222624036a6d Mon Sep 17 00:00:00 2001
From: Jean-Francois Denise <jdenise@redhat.com>
Date: Tue, 10 Oct 2023 11:46:18 +0200
Subject: [PATCH] Fix for JBEAP-24017, [7.4.* JDK 17 images] - Missing required
 KEYCLOAK mechanism

---
 .../resources/configs/standalone/standalone.xml/config.xml    | 3 +--
 jboss/container/eap/galleon/config/ee-elytron/configure.sh    | 4 ----
 .../standalone/standalone-microprofile-ha.xml/config.xml      | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml
index 27d44f9b..91c2975d 100644
--- a/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml
+++ b/jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml
@@ -9,8 +9,7 @@
         <include name="amq6-rar"/>
     </layers>
 
-     <!-- No sso packages for JDK17 techpreview -->
-    <!-- <feature-group name="sso"/> -->
+    <feature-group name="sso"/>
 
     <!-- JDK 17 -->
     <exclude feature-id="core-service.management.security-realm:security-realm=ApplicationRealm"/>
diff --git a/jboss/container/eap/galleon/config/ee-elytron/configure.sh b/jboss/container/eap/galleon/config/ee-elytron/configure.sh
index dbbadb3c..7c873982 100644
--- a/jboss/container/eap/galleon/config/ee-elytron/configure.sh
+++ b/jboss/container/eap/galleon/config/ee-elytron/configure.sh
@@ -11,7 +11,3 @@ chmod -R ug+rwX $SCRIPT_DIR
 pushd ${ARTIFACTS_DIR}
 cp -pr * /
 popd
-
-# Remove sso content for JDK17 tech preview image. To be removed when supported.
-rm "${GALLEON_FP_PATH}/src/main/resources/feature_groups/sso.xml"
-rm -r "${GALLEON_FP_PATH}/src/main/resources/layers/standalone/sso"
diff --git a/jboss/container/eap/galleon/config/mp-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone-microprofile-ha.xml/config.xml b/jboss/container/eap/galleon/config/mp-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone-microprofile-ha.xml/config.xml
index b73f0ca6..a16f99d3 100644
--- a/jboss/container/eap/galleon/config/mp-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone-microprofile-ha.xml/config.xml
+++ b/jboss/container/eap/galleon/config/mp-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone-microprofile-ha.xml/config.xml
@@ -4,7 +4,7 @@
 
     
     <!-- sso packages -->
-    <!--<feature-group name="sso"/>-->
+    <feature-group name="sso"/>
 
     <!-- JDK17. The default standalone-microprofile-ha.xml is secured with legacy security realm for the http-invoker. Use elytron. -->
     <feature spec="subsystem.undertow">