From 4cf17a0b2b17bdebd533caffd06978180b29c0ab Mon Sep 17 00:00:00 2001
From: Yeikel <email@yeikel.com>
Date: Sat, 11 Jan 2025 09:41:42 -0500
Subject: [PATCH 1/2] Infra: FE: Enforce pnpm using a range (#747)

---
 frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index 49f9bc732..b1133c3a7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -104,7 +104,7 @@
   },
   "engines": {
     "node": "18.17.1",
-    "pnpm": "9.15.0"
+    "pnpm": "^9.15.0"
   },
   "pnpm": {
     "overrides": {

From 2b3abd212d79f6c1e99c9f19893ee8b90ad4c48c Mon Sep 17 00:00:00 2001
From: Yeikel <email@yeikel.com>
Date: Mon, 13 Jan 2025 13:21:04 -0500
Subject: [PATCH 2/2] BE: Chore: remove unnecessary architecture check in unit
 test (#704)

---
 api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java | 5 +----
 pom.xml                                                     | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java b/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java
index 7224649b1..9e9e903cc 100644
--- a/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java
+++ b/api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java
@@ -37,10 +37,7 @@ public abstract class AbstractIntegrationTest {
   public static final String LOCAL = "local";
   public static final String SECOND_LOCAL = "secondLocal";
 
-  private static final boolean IS_ARM =
-      System.getProperty("os.arch").contains("arm") || System.getProperty("os.arch").contains("aarch64");
-
-  private static final String CONFLUENT_PLATFORM_VERSION = IS_ARM ? "7.8.0.arm64" : "7.8.0";
+  private static final String CONFLUENT_PLATFORM_VERSION = "7.8.0";
 
   public static final KafkaContainer kafka = new KafkaContainer(
       DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION))
diff --git a/pom.xml b/pom.xml
index 05f68f576..a66cd8b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
         <junit.version>5.11.2</junit.version>
         <mockito.version>5.14.2</mockito.version>
         <okhttp3.mockwebserver.version>4.12.0</okhttp3.mockwebserver.version>
-        <testcontainers.version>1.20.2</testcontainers.version>
+        <testcontainers.version>1.20.4</testcontainers.version>
 
         <!-- Frontend dependency versions -->
         <node.version>v18.17.1</node.version>