Skip to content

Commit d8beb34

Browse files
committed
Merge branch 'refs/heads/main' into ad_it_test
2 parents db7c2a3 + 2b3abd2 commit d8beb34

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

api/src/test/java/io/kafbat/ui/AbstractIntegrationTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ public abstract class AbstractIntegrationTest {
3737
public static final String LOCAL = "local";
3838
public static final String SECOND_LOCAL = "secondLocal";
3939

40-
private static final boolean IS_ARM =
41-
System.getProperty("os.arch").contains("arm") || System.getProperty("os.arch").contains("aarch64");
42-
43-
private static final String CONFLUENT_PLATFORM_VERSION = IS_ARM ? "7.8.0.arm64" : "7.8.0";
40+
private static final String CONFLUENT_PLATFORM_VERSION = "7.8.0";
4441

4542
public static final KafkaContainer kafka = new KafkaContainer(
4643
DockerImageName.parse("confluentinc/cp-kafka").withTag(CONFLUENT_PLATFORM_VERSION))

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
},
105105
"engines": {
106106
"node": "18.17.1",
107-
"pnpm": "9.15.0"
107+
"pnpm": "^9.15.0"
108108
},
109109
"pnpm": {
110110
"overrides": {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<junit.version>5.11.2</junit.version>
5656
<mockito.version>5.14.2</mockito.version>
5757
<okhttp3.mockwebserver.version>4.12.0</okhttp3.mockwebserver.version>
58-
<testcontainers.version>1.20.2</testcontainers.version>
58+
<testcontainers.version>1.20.4</testcontainers.version>
5959

6060
<!-- Frontend dependency versions -->
6161
<node.version>v18.17.1</node.version>

0 commit comments

Comments
 (0)