From 3ed20e287896cde238f8d7c2d2b8b8bfc943dc1b Mon Sep 17 00:00:00 2001
From: Peter Skopek <pskopek@redhat.com>
Date: Thu, 29 Jul 2021 09:21:58 +0200
Subject: [PATCH] KEYCLOAK-18597 Product distribution ZIP does not include
 rh-sso-7.5 folder

---
 distribution/server-dist/pom.xml | 14 ++++++++------
 pom.xml                          |  5 +++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/distribution/server-dist/pom.xml b/distribution/server-dist/pom.xml
index 6beedec8a7..21c1103492 100644
--- a/distribution/server-dist/pom.xml
+++ b/distribution/server-dist/pom.xml
@@ -81,7 +81,6 @@
     </dependencies>
 
     <build>
-        <finalName>${server.output.dir.prefix}-${server.output.dir.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.jboss.galleon</groupId>
@@ -94,7 +93,7 @@
                         </goals>
                         <phase>compile</phase>
                         <configuration>
-                            <install-dir>${basedir}/target/${project.build.finalName}</install-dir>
+                            <install-dir>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}</install-dir>
                             <record-state>false</record-state>
                             <log-time>${galleon.log.time}</log-time>
                             <offline>${galleon.offline}</offline>
@@ -167,7 +166,7 @@
                                     <groupId>org.keycloak</groupId>
                                     <artifactId>keycloak-server-feature-pack</artifactId>
                                     <type>zip</type>
-                                    <outputDirectory>${basedir}/target/${project.build.finalName}/docs</outputDirectory>
+                                    <outputDirectory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/docs</outputDirectory>
                                     <includes>content/docs/licenses-${product.slot}/**</includes>
                                     <fileMappers>
                                         <org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
@@ -196,21 +195,21 @@
                             <excludeDefaultDirectories>true</excludeDefaultDirectories>
                             <filesets>
                                 <fileset>
-                                    <directory>${basedir}/target/${project.build.finalName}</directory>
+                                    <directory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}</directory>
                                     <includes>
                                         <include>README.txt</include>
                                         <include>copyright.txt</include>
                                     </includes>
                                 </fileset>
                                 <fileset>
-                                    <directory>${basedir}/target/${project.build.finalName}/welcome-content</directory>
+                                    <directory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/welcome-content</directory>
                                     <excludes>
                                         <exclude>robots.txt</exclude>
                                         <exclude>index.html</exclude>
                                     </excludes>
                                 </fileset>
                                 <fileset>
-                                    <directory>${basedir}/target/${project.build.finalName}/modules/system/layers/keycloak/org/jboss/as/product</directory>
+                                    <directory>${basedir}/target/${server.output.dir.prefix}-${server.output.dir.version}/modules/system/layers/keycloak/org/jboss/as/product</directory>
                                     <excludes>
                                         <exclude>${product.slot}/**/*</exclude>
                                     </excludes>
@@ -301,6 +300,9 @@
                     </exclusions>
                 </dependency>
             </dependencies>
+            <build>
+                <finalName>keycloak-${project.version}</finalName>
+            </build>
         </profile>
         <profile>
             <id>product</id>
diff --git a/pom.xml b/pom.xml
index ec6c3e0637..dec206de93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1895,6 +1895,7 @@
                 <apache.httpcomponents.httpcore.fuse.version>4.4.4</apache.httpcomponents.httpcore.fuse.version>
                 <ee.maven.groupId>org.wildfly</ee.maven.groupId>
                 <ee.maven.version>${wildfly.version}</ee.maven.version>
+                <product.filename.version>${project.version}</product.filename.version>
             </properties>
             <modules>
                 <module>quarkus</module>
@@ -1920,6 +1921,10 @@
                 <product.default-profile>product</product.default-profile>
                 <ee.maven.groupId>org.jboss.eap</ee.maven.groupId>
                 <ee.maven.version>${eap.version}</ee.maven.version>
+                <!-- Properties that drive the names of various directories produced by and used in the build -->
+                <server.output.dir.prefix>${product.name}</server.output.dir.prefix>
+                <!-- Version suffix that is appended to directories. Default is the maven GAV version but this can be edited to use a short form version -->
+                <server.output.dir.version>${product.filename.version}</server.output.dir.version>
             </properties>
             <build>
                 <plugins>