From c20a27fffeb4166033dd6a33cd9f1aef9a4d71f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CHarold?= <hjimenez@expediagroup.com>
Date: Thu, 3 Jul 2025 15:46:55 -0500
Subject: [PATCH 1/2] fix: add multiplatform support

---
 beekeeper-api/pom.xml              | 17 +++++++++++++++++
 beekeeper-metadata-cleanup/pom.xml | 17 +++++++++++++++++
 beekeeper-path-cleanup/pom.xml     | 17 +++++++++++++++++
 beekeeper-scheduler-apiary/pom.xml | 17 +++++++++++++++++
 pom.xml                            |  1 +
 5 files changed, 69 insertions(+)

diff --git a/beekeeper-api/pom.xml b/beekeeper-api/pom.xml
index 6e960732..bab33edb 100644
--- a/beekeeper-api/pom.xml
+++ b/beekeeper-api/pom.xml
@@ -83,6 +83,23 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <from>
+            <platforms>
+              <platform>
+                <architecture>amd64</architecture>
+                <os>linux</os>
+              </platform>
+              <platform>
+                <architecture>arm64</architecture>
+                <os>linux</os>
+              </platform>
+            </platforms>
+          </from>
+          <container>
+            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+          </container>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/beekeeper-metadata-cleanup/pom.xml b/beekeeper-metadata-cleanup/pom.xml
index 869cd058..c0fdbb72 100644
--- a/beekeeper-metadata-cleanup/pom.xml
+++ b/beekeeper-metadata-cleanup/pom.xml
@@ -139,6 +139,23 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <from>
+            <platforms>
+              <platform>
+                <architecture>amd64</architecture>
+                <os>linux</os>
+              </platform>
+              <platform>
+                <architecture>arm64</architecture>
+                <os>linux</os>
+              </platform>
+            </platforms>
+          </from>
+          <container>
+            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+          </container>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/beekeeper-path-cleanup/pom.xml b/beekeeper-path-cleanup/pom.xml
index 95176aca..9ab84440 100644
--- a/beekeeper-path-cleanup/pom.xml
+++ b/beekeeper-path-cleanup/pom.xml
@@ -119,6 +119,23 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <from>
+            <platforms>
+              <platform>
+                <architecture>amd64</architecture>
+                <os>linux</os>
+              </platform>
+              <platform>
+                <architecture>arm64</architecture>
+                <os>linux</os>
+              </platform>
+            </platforms>
+          </from>
+          <container>
+            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+          </container>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/beekeeper-scheduler-apiary/pom.xml b/beekeeper-scheduler-apiary/pom.xml
index 538ec0f5..438a1380 100644
--- a/beekeeper-scheduler-apiary/pom.xml
+++ b/beekeeper-scheduler-apiary/pom.xml
@@ -137,6 +137,23 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>jib-maven-plugin</artifactId>
+        <configuration>
+          <from>
+            <platforms>
+              <platform>
+                <architecture>amd64</architecture>
+                <os>linux</os>
+              </platform>
+              <platform>
+                <architecture>arm64</architecture>
+                <os>linux</os>
+              </platform>
+            </platforms>
+          </from>
+          <container>
+            <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+          </container>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/pom.xml b/pom.xml
index 3a25e5aa..384375c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
     <jackson.version>2.17.2</jackson.version>
     <hive.version>2.3.7</hive.version>
     <hcommon-hive-metastore.version>1.4.2</hcommon-hive-metastore.version>
+    <jib.maven.plugin.version>3.4.4</jib.maven.plugin.version>
   </properties>
 
   <dependencyManagement>

From 61ce815edb4509c745c4cad99779b99346e7da8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CHarold?= <hjimenez@expediagroup.com>
Date: Mon, 28 Jul 2025 16:08:54 -0500
Subject: [PATCH 2/2] fix: Added multiplatform support for beekeeper images.
 Added amd64 and arm64

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db1ff449..42821dbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.6.3] - 2025-07-28
+## Added
+- Added multiplatform support for beekeeper images. Added amd64 and arm64.
+
 ## [3.6.2] - 2025-07-23
 ## Fixed
 * Upgrade parent pom to accomodate for new sonatype deployment.