From 1bcb397a2f2355b7464b2944066633c4ab847e7a Mon Sep 17 00:00:00 2001
From: Peter Skopek <pskopek@redhat.com>
Date: Wed, 9 Sep 2020 11:28:59 +0200
Subject: [PATCH] KEYCLOAK-14953 Unify wildfly component versions related
 properties already used in keycloak.

---
 .../adapter-galleon-pack/pom.xml                   | 14 ++++----------
 .../standalone/keycloak-client-oidc/layer-spec.xml |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml
index fd0886fd257..ec4aa89ccfc 100644
--- a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml
+++ b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml
@@ -218,13 +218,13 @@
                     <dependency>
                         <groupId>org.wildfly.core</groupId>
                         <artifactId>wildfly-embedded</artifactId>
-                        <version>${version.org.wildfly.core}</version>
+                        <version>${wildfly.core.version}</version>
                     </dependency>
                     <!-- If you add a dependency on wildfly-embedded you need to bring your own transitives -->
                     <dependency>
                         <groupId>org.wildfly.common</groupId>
                         <artifactId>wildfly-common</artifactId>
-                        <version>${version.org.wildfly.common}</version>
+                        <version>${wildfly.common.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -257,9 +257,6 @@
             </activation>
             <properties>
                 <galleon-adapter-group-id>org.keycloak</galleon-adapter-group-id>
-                <version.org.wildfly>20.0.0.Final</version.org.wildfly>
-                <version.org.wildfly.core>12.0.1.Final</version.org.wildfly.core>
-                <version.org.wildfly.common>1.5.4.Final</version.org.wildfly.common>
             </properties>
             <repositories>
                 <repository>
@@ -274,7 +271,7 @@
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-galleon-pack</artifactId>
-                    <version>${version.org.wildfly}</version>
+                    <version>${wildfly.version}</version>
                     <type>zip</type>
                     <scope>provided</scope>
                 </dependency>
@@ -289,15 +286,12 @@
             </activation>
             <properties>
                 <galleon-adapter-group-id>org.jboss.sso</galleon-adapter-group-id>
-                <version.org.jboss.eap>7.3.2.GA-redhat-00002</version.org.jboss.eap>
-                <version.org.wildfly.core>10.1.11.Final-redhat-00001</version.org.wildfly.core>
-                <version.org.wildfly.common>1.5.2.Final-redhat-00002</version.org.wildfly.common>
             </properties>
             <dependencies>
                 <dependency>
                     <groupId>org.jboss.eap</groupId>
                     <artifactId>wildfly-galleon-pack</artifactId>
-                    <version>${version.org.jboss.eap}</version>
+                    <version>${eap.version}</version>
                     <type>zip</type>
                     <scope>provided</scope>
                 </dependency>
diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml
index 851c355e7cf..3dc31809581 100644
--- a/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml
+++ b/distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml
@@ -5,7 +5,7 @@
         <layer name="elytron"/>
         <layer name="undertow"/>
     </dependencies>
-     <feature spec="subsystem.keycloak"/>
+    <feature spec="subsystem.keycloak"/>
     <feature spec="subsystem.elytron.custom-realm">
         <param name="custom-realm" value="KeycloakOIDCRealm"/>
         <param name="class-name" value="org.keycloak.adapters.elytron.KeycloakSecurityRealm"/>