From 8d7b4dc6902e18b5cfba8b02827fa430fc1aefea Mon Sep 17 00:00:00 2001
From: Ruben Quesada Lopez <rubenql@gmail.com>
Date: Mon, 3 Aug 2026 15:34:42 +0100
Subject: [PATCH 1/2] HIVE-29793: Packaging pom.xml docker profile passes flags
 and values as joined argv strings

---
 packaging/pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packaging/pom.xml b/packaging/pom.xml
index ed0090ff64ba..d00ca95d8f9d 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -267,8 +267,10 @@
               </environmentVariables>
               <arguments>
                 <argument>src/docker/build.sh</argument>
-                <argument>-hadoop ${hadoop.version}</argument>
-                <argument>-tez ${tez.version}</argument>
+                <argument>-hadoop</argument>
+                <argument>${hadoop.version}</argument>
+                <argument>-tez</argument>
+                <argument>${tez.version}</argument>
               </arguments>
             </configuration>
           </plugin>

From 40c2d918b7347a27f01ff62ddb0974bbf50c7446 Mon Sep 17 00:00:00 2001
From: Ruben Quesada Lopez <rubenql@gmail.com>
Date: Thu, 6 Aug 2026 18:47:22 +0100
Subject: [PATCH 2/2] Apply fix to standalone-metastore/packaging/pom.xml

---
 standalone-metastore/packaging/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/standalone-metastore/packaging/pom.xml b/standalone-metastore/packaging/pom.xml
index 4fb9de38f3ea..6e38b01ef5be 100644
--- a/standalone-metastore/packaging/pom.xml
+++ b/standalone-metastore/packaging/pom.xml
@@ -162,7 +162,8 @@
                   </environmentVariables>
                   <arguments>
                     <argument>src/docker/build.sh</argument>
-                    <argument>-hadoop ${hadoop.version}</argument>
+                    <argument>-hadoop</argument>
+                    <argument>${hadoop.version}</argument>
                   </arguments>
                 </configuration>
               </execution>