[CIAM-743] Explicitly add "org.keycloak.keycloak-model-infinispan"

module as a dependency to the definition of the Wildfly's
"org.wildfly.clustering.infinispan.spi" module.xml

Rationale:
----------

The "org.wildfly.clustering.infinispan.spi" module of vanilla Wildfly / EAP
doesn't deploy RH-SSO server subsystem on top of Wildfly / EAP (thus doesn't
require this dependency).

But since the RH-SSO server overlay does, the "org.wildfly.clustering.infinispan.spi"
requires explicitly to be equipped also with the "org.keycloak.keycloak-model-infinispan"
module dependency, so the classes, defined within this RH-SSO module are properly found,
when referenced

Besides that, the JBoss EAP 7.4.0 image builder Maven repository got moved from
candidates/ to released/. Update the path to that artifact appropriately

Signed-off-by: Jan Lieskovsky <[email protected]>

Author: Jan Lieskovsky

modules/eap/setup/eap/modules/configure.sh

@@ -1057,3 +1057,36 @@ for dir in ${JBOSS_HOME} $DEPLOYMENTS_DIR; do
     chmod -R g+rwX $dir
 done
 ### End of: 'jboss.container.eap.final-setup' module
+
+### CIAM-743 -- Start of RH-SSO add-on
+
+# Explicitly add "org.keycloak.keycloak-model-infinispan" module as a
+# dependency to the Wildfly's "org.wildfly.clustering.infinispan.spi"
+# module
+
+# Path to 'module.xml' file of "org.wildfly.clustering.infinispan.spi" module
+readonly wildflyClusteringInfinispanSpiModuleXml="${JBOSS_HOME}/modules/system/layers/base/org/wildfly/clustering/infinispan/spi/main/module.xml"
+
+# Respect the existing indentation of the underlying "module.xml" file
+readonly fourSpaces="    "
+
+# Form of "org.keycloak.keycloak-model-infinispan" dependency to be appended
+# right before the end of </dependencies> section of the "module.xml" file of
+# "org.wildfly.clustering.infinispan.spi" module
+keycloakModelInfinispanDependency=$(cat <<- EOF
+${fourSpaces}${fourSpaces}<!--
+${fourSpaces}${fourSpaces}  ~ CIAM-743: Explicitly add "org.keycloak.keycloak-model-infinispan" module as
+${fourSpaces}${fourSpaces}  ~ a dependency to the Wildfly's "org.wildfly.clustering.infinispan.spi" module
+${fourSpaces}${fourSpaces}  -->
+${fourSpaces}${fourSpaces}<module name="org.keycloak.keycloak-model-infinispan" export="true" services="import"/>
+EOF
+)
+
+# Escape all newlines in the value of 'keycloakModelInfinispanDependency'
+keycloakModelInfinispanDependency="${keycloakModelInfinispanDependency//$'\n'/\\n}"
+
+# Actually append the new "org.keycloak.keycloak-model-infinispan" dependency line
+sed -i "s|${fourSpaces}</dependencies>|${keycloakModelInfinispanDependency}\n${fourSpaces}</dependencies>|" \
+    "${wildflyClusteringInfinispanSpiModuleXml}"
+
+### CIAM-743 -- End of RH-SSO add-on

modules/eap/setup/eap/modules/module.yaml

@@ -32,7 +32,7 @@ artifacts:
 - name: eap-image-maven-repo
   target: maven-repo.zip
   md5: 244700ed92787ad537e360069d9ca9b1
-  url: http://$DOWNLOAD_SERVER/devel/candidates/jboss/eap/JBEAP-7.4.0.GA-CR3/jboss-eap-7.4.0.GA-CR3-image-builder-maven-repository.zip
+  url: http://$DOWNLOAD_SERVER/released/JBoss-middleware/eap7/7.4.0/jboss-eap-7.4.0-image-builder-maven-repository.zip
 # CIAM-711: Update RH-SSO server overlay to 'RH-SSO 7.5.0.CR4' build
 - name: keycloak-server-overlay.zip
   md5: 4150d09f7bf5d524b4173f8850a06617

modules/sso/config/launch/setup/75/added/launch/add-sso-realm.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function prepareEnv() {
   unset SSO_REALM
@@ -12,17 +12,13 @@ function configure() {
 }
 
 function realm_import() {
-  if [ -n "$SSO_REALM" ]; then
+  if [ -n "${SSO_REALM}" ]; then
     sed -i "s|##REALM##|${SSO_REALM}|" "${IMPORT_REALM_FILE}"
-
-    if [ -n "$SSO_SERVICE_USERNAME" ]; then
-
-      if [ -n "$SSO_SERVICE_PASSWORD" ]; then
-        $JBOSS_HOME/bin/add-user-keycloak.sh -r $SSO_REALM -u $SSO_SERVICE_USERNAME -p $SSO_SERVICE_PASSWORD --roles realm-management/realm-admin
+    if [ -n "${SSO_SERVICE_USERNAME}" ]; then
+      if [ -n "${SSO_SERVICE_PASSWORD}" ]; then
+        "${JBOSS_HOME}/bin/add-user-keycloak.sh" -r "${SSO_REALM}" -u "${SSO_SERVICE_USERNAME}" -p "${SSO_SERVICE_PASSWORD}" --roles realm-management/realm-admin
       fi
     fi
-
-    SSO_IMPORT_FILE="$IMPORT_REALM_FILE"
+    export SSO_IMPORT_FILE="${IMPORT_REALM_FILE}"
   fi
 }
-