Skip to content

Commit 82bd26d

Browse files
committed
align kafka versions
1 parent d507a9f commit 82bd26d

File tree

9 files changed

+20
-19
lines changed

9 files changed

+20
-19
lines changed

.dev/dev_arm64.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
KAFKA_CLUSTERS_0_AUDIT_CONSOLEAUDITENABLED: 'true'
3333

3434
kafka0:
35-
image: confluentinc/cp-kafka:7.6.0.arm64
35+
image: confluentinc/cp-kafka:7.8.0.arm64
3636
user: "0:0"
3737
hostname: kafka0
3838
container_name: kafka0
@@ -60,7 +60,7 @@ services:
6060
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
6161

6262
schema-registry0:
63-
image: confluentinc/cp-schema-registry:7.6.0.arm64
63+
image: confluentinc/cp-schema-registry:7.8.0.arm64
6464
ports:
6565
- 8085:8085
6666
depends_on:
@@ -76,7 +76,7 @@ services:
7676
SCHEMA_REGISTRY_KAFKASTORE_TOPIC: _schemas
7777

7878
kafka-connect0:
79-
image: confluentinc/cp-kafka-connect:7.6.0.arm64
79+
image: confluentinc/cp-kafka-connect:7.8.0.arm64
8080
ports:
8181
- 8083:8083
8282
depends_on:
@@ -101,7 +101,7 @@ services:
101101
CONNECT_PLUGIN_PATH: "/usr/share/java,/usr/share/confluent-hub-components,/usr/local/share/kafka/plugins,/usr/share/filestream-connectors"
102102

103103
ksqldb0:
104-
image: confluentinc/cp-ksqldb-server:7.6.0.arm64
104+
image: confluentinc/cp-ksqldb-server:7.8.0.arm64
105105
depends_on:
106106
- kafka0
107107
- kafka-connect0
@@ -119,7 +119,7 @@ services:
119119
KSQL_CACHE_MAX_BYTES_BUFFERING: 0
120120

121121
kafka-init-topics:
122-
image: confluentinc/cp-kafka:7.6.0.arm64
122+
image: confluentinc/cp-kafka:7.8.0.arm64
123123
volumes:
124124
- ../documentation/compose/data/message.json:/data/message.json
125125
depends_on:

api/pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@
5050
<dependency>
5151
<groupId>org.apache.kafka</groupId>
5252
<artifactId>kafka-clients</artifactId>
53-
<version>${kafka-clients.version}</version>
53+
<!-- ccs stands for Confluent Community Edition
54+
See https://www.confluent.io/confluent-community-license-faq/
55+
-->
56+
<version>${confluent.version}-ccs</version>
5457
</dependency>
5558
<dependency>
5659
<groupId>org.apache.commons</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public abstract class AbstractIntegrationTest {
3838
private static final boolean IS_ARM =
3939
System.getProperty("os.arch").contains("arm") || System.getProperty("os.arch").contains("aarch64");
4040

41-
private static final String CONFLUENT_PLATFORM_VERSION = IS_ARM ? "7.2.1.arm64" : "7.2.1";
41+
private static final String CONFLUENT_PLATFORM_VERSION = IS_ARM ? "7.8.0.arm64" : "7.8.0";
4242

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

documentation/compose/e2e-tests.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ services:
2929
KAFKA_CLUSTERS_0_KSQLDBSERVER: http://ksqldb:8088
3030

3131
kafka0:
32-
image: confluentinc/cp-kafka:7.6.0
32+
image: confluentinc/cp-kafka:7.8.0
3333
user: "0:0"
3434
hostname: kafka0
3535
container_name: kafka0
@@ -62,7 +62,7 @@ services:
6262
CLUSTER_ID: 'MkU3OEVBNTcwNTJENDM2Qk'
6363

6464
schemaregistry0:
65-
image: confluentinc/cp-schema-registry:7.6.0
65+
image: confluentinc/cp-schema-registry:7.8.0
6666
ports:
6767
- 8085:8085
6868
depends_on:
@@ -87,7 +87,7 @@ services:
8787
build:
8888
context: ./kafka-connect
8989
args:
90-
image: confluentinc/cp-kafka-connect:7.6.0
90+
image: confluentinc/cp-kafka-connect:7.8.0
9191
ports:
9292
- 8083:8083
9393
depends_on:
@@ -121,7 +121,7 @@ services:
121121
# AWS_SECRET_ACCESS_KEY: ""
122122

123123
kafka-init-topics:
124-
image: confluentinc/cp-kafka:7.6.0
124+
image: confluentinc/cp-kafka:7.8.0
125125
volumes:
126126
- ./data/message.json:/data/message.json
127127
depends_on:
@@ -161,7 +161,7 @@ services:
161161
command: sh -c '/connectors/start.sh'
162162

163163
ksqldb:
164-
image: confluentinc/cp-ksqldb-server:7.6.0
164+
image: confluentinc/cp-ksqldb-server:7.8.0
165165
healthcheck:
166166
test: [ "CMD", "timeout", "1", "curl", "--silent", "--fail", "http://localhost:8088/info" ]
167167
interval: 30s

e2e-tests/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<artifactId>e2e-tests</artifactId>
1313

1414
<properties>
15-
<kafka.version>3.8.0</kafka.version>
1615
<contract>${project.version}</contract>
1716
<maven.compiler.release>21</maven.compiler.release>
1817
<maven.surefire.release>3.5.1</maven.surefire.release>
@@ -25,7 +24,7 @@
2524
<dependency>
2625
<groupId>org.apache.kafka</groupId>
2726
<artifactId>kafka_2.13</artifactId>
28-
<version>${kafka.version}</version>
27+
<version>${confluent.version}-ccs</version>
2928
</dependency>
3029
<dependency>
3130
<groupId>io.kafbat.ui</groupId>

frontend/pnpm-lock.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/src/components/common/Icons/DiscordIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const DiscordIcon: React.FC<{ className?: string }> = ({ className }) => (
1010
xmlns="http://www.w3.org/2000/svg"
1111
>
1212
<path
13-
d="M18.6239 1.60293C17.2217 0.92338 15.7181 0.422718 14.1459 0.135969C14.1173 0.130434 14.0887 0.144265 14.0739 0.171926C13.8805 0.535202 13.6663 1.00913 13.5163 1.38163C11.8254 1.11425 10.1431 1.11425 8.48679 1.38163C8.33676 1.00085 8.11478 0.535202 7.92053 0.171926C7.90578 0.145187 7.87718 0.131357 7.84855 0.135969C6.27725 0.421802 4.7736 0.922464 3.37052 1.60293C3.35838 1.60846 3.34797 1.61769 3.34106 1.62967C0.488942 6.13013 -0.292371 10.52 0.0909151 14.8554C0.0926494 14.8766 0.103922 14.8969 0.119532 14.9098C2.00127 16.3693 3.82406 17.2554 5.61301 17.8428C5.64164 17.852 5.67197 17.8409 5.69019 17.816C6.11337 17.2057 6.49059 16.5621 6.81402 15.8853C6.83311 15.8456 6.81489 15.7986 6.77588 15.7829C6.17754 15.5432 5.6078 15.2509 5.05975 14.919C5.0164 14.8923 5.01293 14.8268 5.05281 14.7954C5.16814 14.7041 5.2835 14.6092 5.39363 14.5133C5.41355 14.4958 5.44131 14.4921 5.46474 14.5031C9.06518 16.2394 12.9631 16.2394 16.521 14.5031C16.5445 14.4912 16.5722 14.4949 16.593 14.5124C16.7032 14.6083 16.8185 14.7041 16.9347 14.7954C16.9746 14.8268 16.972 14.8923 16.9286 14.919C16.3806 15.2574 15.8108 15.5432 15.2116 15.782C15.1726 15.7977 15.1553 15.8456 15.1744 15.8853C15.5047 16.5611 15.882 17.2047 16.2973 17.8151C16.3147 17.8409 16.3459 17.852 16.3745 17.8428C18.1721 17.2554 19.9949 16.3693 21.8766 14.9098C21.8931 14.8969 21.9035 14.8775 21.9053 14.8563C22.364 9.84408 21.1369 5.49024 18.6525 1.63058C18.6465 1.61769 18.6361 1.60846 18.6239 1.60293ZM7.35169 12.2156C6.26771 12.2156 5.37454 11.1645 5.37454 9.8736C5.37454 8.58274 6.25039 7.53164 7.35169 7.53164C8.46163 7.53164 9.34616 8.59197 9.32881 9.8736C9.32881 11.1645 8.45296 12.2156 7.35169 12.2156ZM14.6619 12.2156C13.5779 12.2156 12.6847 11.1645 12.6847 9.8736C12.6847 8.58274 13.5606 7.53164 14.6619 7.53164C15.7718 7.53164 16.6563 8.59197 16.639 9.8736C16.639 11.1645 15.7718 12.2156 14.6619 12.2156Z"
13+
d="M18.6239 1.60293C17.2217 0.92338 15.7181 0.422718 14.1459 0.135969C14.1173 0.130434 14.0887 0.144265 14.0739 0.171926C13.8805 0.535202 13.6663 1.00913 13.5163 1.38163C11.8254 1.11425 10.1431 1.11425 8.48679 1.38163C8.33676 1.00085 8.11478 0.535202 7.92053 0.171926C7.90578 0.145187 7.87718 0.131357 7.84855 0.135969C6.27725 0.421802 4.77.8.0.922464 3.37052 1.60293C3.35838 1.60846 3.34797 1.61769 3.34106 1.62967C0.488942 6.13013 -0.292371 10.52 0.0909151 14.8554C0.0926494 14.87.8.0.103922 14.8969 0.119532 14.9098C2.00127 16.3693 3.82406 17.2554 5.61301 17.8428C5.64164 17.852 5.67197 17.8409 5.69019 17.816C6.11337 17.2057 6.49059 16.5621 6.81402 15.8853C6.83311 15.8456 6.81489 15.7986 6.77588 15.7829C6.17754 15.5432 5.6078 15.2509 5.05975 14.919C5.0164 14.8923 5.01293 14.8268 5.05281 14.7954C5.16814 14.7041 5.2835 14.6092 5.39363 14.5133C5.41355 14.4958 5.44131 14.4921 5.46474 14.5031C9.06518 16.2394 12.9631 16.2394 16.521 14.5031C16.5445 14.4912 16.5722 14.4949 16.593 14.5124C16.7032 14.6083 16.8185 14.7041 16.9347 14.7954C16.9746 14.8268 16.972 14.8923 16.9286 14.919C16.3806 15.2574 15.8108 15.5432 15.2116 15.782C15.1726 15.7977 15.1553 15.8456 15.1744 15.8853C15.5047 16.5611 15.882 17.2047 16.2973 17.8151C16.3147 17.8409 16.3459 17.852 16.3745 17.8428C18.1721 17.2554 19.9949 16.3693 21.8766 14.9098C21.8931 14.8969 21.9035 14.8775 21.9053 14.8563C22.364 9.84408 21.1369 5.49024 18.6525 1.63058C18.6465 1.61769 18.6361 1.60846 18.6239 1.60293ZM7.35169 12.2156C6.26771 12.2156 5.37454 11.1645 5.37454 9.8736C5.37454 8.58274 6.25039 7.53164 7.35169 7.53164C8.46163 7.53164 9.34616 8.59197 9.32881 9.8736C9.32881 11.1645 8.45296 12.2156 7.35169 12.2156ZM14.6619 12.2156C13.5779 12.2156 12.6847 11.1645 12.6847 9.8736C12.6847 8.58274 13.5606 7.53164 14.6619 7.53164C15.7718 7.53164 16.6563 8.59197 16.639 9.8736C16.639 11.1645 15.7718 12.2156 14.6619 12.2156Z"
1414
fillRule="evenodd"
1515
clipRule="evenodd"
1616
/>

frontend/src/lib/fixtures/topics.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export const topicStatsPayload: TopicAnalysis = {
212212
valueSize: topicStatsSize,
213213
hourlyMsgCounts: [
214214
{ hourStart: 1659722400000, count: 18040 },
215-
{ hourStart: 1659726000000, count: 20070 },
215+
{ hourStart: 16597.8.00000, count: 20070 },
216216
],
217217
},
218218
{

pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@
3535
<assertj.version>3.25.3</assertj.version>
3636
<avro.version>1.11.4</avro.version>
3737
<byte-buddy.version>1.14.19</byte-buddy.version>
38-
<confluent.version>7.4.4</confluent.version>
38+
<confluent.version>7.8.0</confluent.version>
3939
<datasketches-java.version>3.1.0</datasketches-java.version>
4040
<groovy.version>3.0.13</groovy.version>
4141
<jackson.version>2.14.0</jackson.version>
42-
<kafka-clients.version>3.8.0</kafka-clients.version>
4342
<org.mapstruct.version>1.6.2</org.mapstruct.version>
4443
<org.projectlombok.version>1.18.34</org.projectlombok.version>
4544
<protobuf-java.version>3.25.5</protobuf-java.version>

0 commit comments

Comments
 (0)