From 0f8d5e9ee5182f06fa57c4e06dc6e979e4b90afc Mon Sep 17 00:00:00 2001
From: Peter Skopek <pskopek@redhat.com>
Date: Tue, 7 Nov 2023 10:31:53 +0100
Subject: [PATCH] Add possibility to override fileName and base directory of
 Keycloak Quarkus distribution ZIP archive (#24518)

Closes #24283

Signed-off-by: Peter Skopek <pskopek@redhat.com>
---
 operator/pom.xml                                   |  1 -
 pom.xml                                            | 14 ++++++++++++++
 quarkus/dist/assembly.xml                          |  1 +
 quarkus/dist/pom.xml                               |  2 +-
 .../servers/auth-server/quarkus/pom.xml            |  2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/operator/pom.xml b/operator/pom.xml
index e79291b3ecd..8a15debee86 100644
--- a/operator/pom.xml
+++ b/operator/pom.xml
@@ -228,7 +228,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
diff --git a/pom.xml b/pom.xml
index 44705873413..24d5fd6015e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,6 +50,14 @@
 
         <project.build-time>${timestamp}</project.build-time>
 
+        <!-- Following properties are used for downstream build to alter final distribution archive file name and internal base directory of the archive. -->
+        <dist.archive.file.prefix>keycloak</dist.archive.file.prefix>
+        <dist.archive.dir.prefix>${dist.archive.file.prefix}</dist.archive.dir.prefix>
+        <dist.archive.file.version>${project.version}</dist.archive.file.version>
+        <dist.archive.dir.version>${project.version}</dist.archive.dir.version>
+        <dist.archive.file>${dist.archive.file.prefix}-${dist.archive.file.version}</dist.archive.file>
+        <dist.archive.dir>${dist.archive.dir.prefix}-${dist.archive.dir.version}</dist.archive.dir>
+
         <!-- core version for app-server-wildfly/eap tests, should match wildfly/eap server -->
         <tests.wildfly.core.version>19.0.1.Final</tests.wildfly.core.version>
 
@@ -190,6 +198,7 @@
         <shade.plugin.version>3.4.1</shade.plugin.version>
         <smallrye.openapi.generator.plugin.version>3.1.2</smallrye.openapi.generator.plugin.version>
         <openapi.generator.plugin.version>6.3.0</openapi.generator.plugin.version>
+        <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
 
         <!-- Surefire Settings -->
         <surefire.memory.Xms>512m</surefire.memory.Xms>
@@ -1925,6 +1934,11 @@
                     <artifactId>asciidoctor-maven-plugin</artifactId>
                     <version>${asciidoctor.plugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>${build-helper-maven-plugin.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/quarkus/dist/assembly.xml b/quarkus/dist/assembly.xml
index 85e94d5b788..e2e0f4d8173 100755
--- a/quarkus/dist/assembly.xml
+++ b/quarkus/dist/assembly.xml
@@ -24,6 +24,7 @@
     </formats>
 
     <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>${dist.archive.dir}</baseDirectory>
 
     <fileSets>
         <fileSet>
diff --git a/quarkus/dist/pom.xml b/quarkus/dist/pom.xml
index fba99bf1ab9..6c2964b310a 100755
--- a/quarkus/dist/pom.xml
+++ b/quarkus/dist/pom.xml
@@ -49,7 +49,7 @@
     </dependencies>
 
     <build>
-        <finalName>keycloak-${project.version}</finalName>
+        <finalName>${dist.archive.file}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
index 138d19435b1..7012c3d3e5f 100644
--- a/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
+++ b/testsuite/integration-arquillian/servers/auth-server/quarkus/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>integration-arquillian-servers-auth-server-quarkus</artifactId>
 
     <properties>
-        <auth.server.home>${project.build.directory}/unpacked/keycloak-${project.version}</auth.server.home>
+        <auth.server.home>${project.build.directory}/unpacked/${dist.archive.dir}</auth.server.home>
         <common.resources>${basedir}/../common</common.resources>
         <session.cache.owners>2</session.cache.owners>
         <offline.session.cache.owners>2</offline.session.cache.owners>