Merge branch 'refs/heads/main' into cleanup_model_package

kafbat · Jan 13, 2025 · 1fd4842 · 1fd4842
2 parents 9931200 + 2b3abd2
commit 1fd4842
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git 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/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": {

diff --git 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>