Skip to content

Commit 4ce1a20

Browse files
rashtaorashtao
authored
Support to Kafka 3.7 (#37)
1 parent 64dfb79 commit 4ce1a20

File tree

3 files changed

+43
-56
lines changed

3 files changed

+43
-56
lines changed

‎.circleci/config.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ commands:
2323
steps:
2424
- run:
2525
name: Create reports
26-
command: mvn -e surefire-report:failsafe-report-only surefire-report:report-only
26+
command: mvn surefire-report:failsafe-report-only surefire-report:report-only
2727
- store_artifacts:
2828
path: target/site
2929
load_cache:
@@ -88,7 +88,7 @@ jobs:
8888
command: ./docker/startup.sh
8989
- run:
9090
name: Integration Tests
91-
command: mvn -e integration-test
91+
command: mvn integration-test
9292
- report
9393
- store_cache
9494

@@ -105,7 +105,7 @@ jobs:
105105
default: 'single'
106106
kafka-version:
107107
type: 'string'
108-
default: '3.6'
108+
default: '3.7'
109109
environment:
110110
STARTER_MODE: <<parameters.topology>>
111111
DOCKER_IMAGE: <<parameters.docker-img>>
@@ -125,7 +125,7 @@ jobs:
125125
command: ./docker/startup.sh
126126
- run:
127127
name: Integration Tests
128-
command: mvn -e integration-test -Ddistributed -Darango.topology=$STARTER_MODE
128+
command: mvn integration-test -Ddistributed -Darango.topology=$STARTER_MODE
129129
- report
130130
- store_cache
131131

@@ -152,7 +152,7 @@ jobs:
152152
command: ./docker/startup.sh
153153
- run:
154154
name: Integration Tests
155-
command: mvn -e integration-test -Ddistributed -DSslTest=true -Dit.test=com.arangodb.kafka.SslIT
155+
command: mvn integration-test -Ddistributed -DSslTest=true -Dit.test=com.arangodb.kafka.SslIT
156156
- report
157157
- store_cache
158158

@@ -180,7 +180,7 @@ jobs:
180180
background: true
181181
- run:
182182
name: Integration Tests
183-
command: mvn -e integration-test -DresilienceTests -Darango.topology=$STARTER_MODE -Dit.test=com.arangodb.kafka.resilience.**
183+
command: mvn integration-test -DresilienceTests -Darango.topology=$STARTER_MODE -Dit.test=com.arangodb.kafka.resilience.**
184184
- report
185185
- store_cache
186186

@@ -259,6 +259,7 @@ workflows:
259259
jdk:
260260
- 'j11'
261261
kafka-version:
262+
- '3.7'
262263
- '3.6'
263264
- '3.5'
264265
- '3.4'

‎demo/docker-compose.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: "2"
22

33
services:
44
kafka-1:
5-
image: docker.io/bitnami/kafka:3.6
5+
image: docker.io/bitnami/kafka:3.7
66
ports:
77
- '19092:19092'
88
environment:
@@ -19,7 +19,7 @@ services:
1919
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,CONTROLLER:PLAINTEXT
2020

2121
kafka-2:
22-
image: docker.io/bitnami/kafka:3.6
22+
image: docker.io/bitnami/kafka:3.7
2323
ports:
2424
- '29092:29092'
2525
environment:
@@ -36,7 +36,7 @@ services:
3636
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,CONTROLLER:PLAINTEXT
3737

3838
kafka-3:
39-
image: docker.io/bitnami/kafka:3.6
39+
image: docker.io/bitnami/kafka:3.7
4040
ports:
4141
- '39092:39092'
4242
environment:
@@ -53,7 +53,7 @@ services:
5353
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,CONTROLLER:PLAINTEXT
5454

5555
kafka-connect-1:
56-
image: docker.io/bitnami/kafka:3.6
56+
image: docker.io/bitnami/kafka:3.7
5757
depends_on:
5858
- kafka-1
5959
- kafka-2
@@ -68,7 +68,7 @@ services:
6868
command: /opt/bitnami/kafka/bin/connect-distributed.sh /tmp/connect-distributed-1.properties
6969

7070
kafka-connect-2:
71-
image: docker.io/bitnami/kafka:3.6
71+
image: docker.io/bitnami/kafka:3.7
7272
depends_on:
7373
- kafka-1
7474
- kafka-2

‎pom.xml‎

Lines changed: 31 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
<maven.compiler.source>8</maven.compiler.source>
6161
<maven.compiler.target>8</maven.compiler.target>
6262
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
63-
<kafka.version>3.6.0</kafka.version>
64-
<confluent.version>7.5.2</confluent.version>
65-
<arangodb.version>7.6.0</arangodb.version>
66-
<jackson.version>2.13.5</jackson.version>
63+
<kafka.version>3.7.1</kafka.version>
64+
<confluent.version>7.6.1</confluent.version>
65+
<arangodb.version>7.7.1</arangodb.version>
66+
<jackson.version>2.16.2</jackson.version>
6767
<slf4j.version>1.7.36</slf4j.version>
6868
</properties>
6969

@@ -169,7 +169,7 @@
169169
<dependency>
170170
<groupId>org.assertj</groupId>
171171
<artifactId>assertj-core</artifactId>
172-
<version>3.24.2</version>
172+
<version>3.26.0</version>
173173
<scope>test</scope>
174174
</dependency>
175175
<dependency>
@@ -190,7 +190,7 @@
190190
<dependency>
191191
<groupId>org.awaitility</groupId>
192192
<artifactId>awaitility</artifactId>
193-
<version>4.2.0</version>
193+
<version>4.2.1</version>
194194
<scope>test</scope>
195195
</dependency>
196196
<dependency>
@@ -214,7 +214,7 @@
214214
<dependency>
215215
<groupId>org.slf4j</groupId>
216216
<artifactId>slf4j-log4j12</artifactId>
217-
<version>1.7.36</version>
217+
<version>${slf4j.version}</version>
218218
<scope>test</scope>
219219
</dependency>
220220
<dependency>
@@ -242,10 +242,21 @@
242242
<dependency>
243243
<groupId>org.junit</groupId>
244244
<artifactId>junit-bom</artifactId>
245-
<version>5.10.0</version>
245+
<version>5.10.3</version>
246246
<scope>import</scope>
247247
<type>pom</type>
248248
</dependency>
249+
<dependency>
250+
<groupId>org.apache.commons</groupId>
251+
<artifactId>commons-compress</artifactId>
252+
<version>1.26.0</version>
253+
<scope>test</scope>
254+
</dependency>
255+
<dependency>
256+
<groupId>org.apache.commons</groupId>
257+
<artifactId>commons-lang3</artifactId>
258+
<version>3.8.1</version>
259+
</dependency>
249260
<dependency>
250261
<groupId>org.apache.kafka</groupId>
251262
<artifactId>kafka-clients</artifactId>
@@ -257,30 +268,15 @@
257268
<version>1.14.5</version>
258269
<scope>test</scope>
259270
</dependency>
260-
<dependency>
261-
<groupId>org.apache.commons</groupId>
262-
<artifactId>commons-compress</artifactId>
263-
<version>1.24.0</version>
264-
<scope>test</scope>
265-
</dependency>
266271
</dependencies>
267272
</dependencyManagement>
268273

269274
<build>
270-
<pluginManagement>
271-
<plugins>
272-
<plugin>
273-
<groupId>org.apache.maven.plugins</groupId>
274-
<artifactId>maven-surefire-report-plugin</artifactId>
275-
<version>3.1.2</version>
276-
</plugin>
277-
</plugins>
278-
</pluginManagement>
279275
<plugins>
280276
<plugin>
281277
<groupId>org.apache.maven.plugins</groupId>
282278
<artifactId>maven-compiler-plugin</artifactId>
283-
<version>3.11.0</version>
279+
<version>3.13.0</version>
284280
<configuration>
285281
<compilerArgs>
286282
<arg>-Xlint:unchecked</arg>
@@ -300,7 +296,7 @@
300296
<plugin>
301297
<groupId>org.apache.maven.plugins</groupId>
302298
<artifactId>maven-source-plugin</artifactId>
303-
<version>3.3.0</version>
299+
<version>3.3.1</version>
304300
<executions>
305301
<execution>
306302
<id>attach-sources</id>
@@ -313,7 +309,7 @@
313309
<plugin>
314310
<groupId>org.apache.maven.plugins</groupId>
315311
<artifactId>maven-javadoc-plugin</artifactId>
316-
<version>3.5.0</version>
312+
<version>3.7.0</version>
317313
<executions>
318314
<execution>
319315
<id>attach-javadocs</id>
@@ -326,12 +322,12 @@
326322
<plugin>
327323
<groupId>org.apache.maven.plugins</groupId>
328324
<artifactId>maven-surefire-plugin</artifactId>
329-
<version>3.1.2</version>
325+
<version>3.3.0</version>
330326
</plugin>
331327
<plugin>
332328
<groupId>org.apache.maven.plugins</groupId>
333329
<artifactId>maven-failsafe-plugin</artifactId>
334-
<version>3.1.2</version>
330+
<version>3.3.0</version>
335331
<executions>
336332
<execution>
337333
<phase>integration-test</phase>
@@ -350,7 +346,7 @@
350346
<plugin>
351347
<groupId>org.apache.maven.plugins</groupId>
352348
<artifactId>maven-gpg-plugin</artifactId>
353-
<version>3.1.0</version>
349+
<version>3.2.4</version>
354350
<configuration>
355351
<gpgArguments>
356352
<arg>--pinentry-mode</arg>
@@ -370,7 +366,7 @@
370366
<plugin>
371367
<groupId>org.codehaus.mojo</groupId>
372368
<artifactId>flatten-maven-plugin</artifactId>
373-
<version>1.5.0</version>
369+
<version>1.6.0</version>
374370
<configuration>
375371
<flattenMode>oss</flattenMode>
376372
</configuration>
@@ -396,7 +392,7 @@
396392
<plugin>
397393
<groupId>org.apache.maven.plugins</groupId>
398394
<artifactId>maven-jar-plugin</artifactId>
399-
<version>3.3.0</version>
395+
<version>3.4.2</version>
400396
</plugin>
401397
<plugin>
402398
<groupId>org.apache.maven.plugins</groupId>
@@ -420,7 +416,7 @@
420416
<plugin>
421417
<groupId>org.apache.maven.plugins</groupId>
422418
<artifactId>maven-enforcer-plugin</artifactId>
423-
<version>3.3.0</version>
419+
<version>3.5.0</version>
424420
<executions>
425421
<execution>
426422
<id>enforce</id>
@@ -452,15 +448,15 @@
452448
<plugin>
453449
<groupId>org.apache.maven.plugins</groupId>
454450
<artifactId>maven-deploy-plugin</artifactId>
455-
<version>3.1.1</version>
451+
<version>3.1.2</version>
456452
<configuration>
457453
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
458454
</configuration>
459455
</plugin>
460456
<plugin>
461457
<groupId>org.sonatype.plugins</groupId>
462458
<artifactId>nexus-staging-maven-plugin</artifactId>
463-
<version>1.6.13</version>
459+
<version>1.7.0</version>
464460
<extensions>true</extensions>
465461
<configuration>
466462
<serverId>ossrh</serverId>
@@ -499,7 +495,7 @@
499495
<plugin>
500496
<groupId>org.codehaus.mojo</groupId>
501497
<artifactId>build-helper-maven-plugin</artifactId>
502-
<version>3.4.0</version>
498+
<version>3.6.0</version>
503499
<executions>
504500
<execution>
505501
<phase>generate-sources</phase>
@@ -581,14 +577,4 @@
581577
</profile>
582578
</profiles>
583579

584-
<reporting>
585-
<plugins>
586-
<plugin>
587-
<groupId>org.apache.maven.plugins</groupId>
588-
<artifactId>maven-surefire-report-plugin</artifactId>
589-
<version>3.1.2</version>
590-
</plugin>
591-
</plugins>
592-
</reporting>
593-
594580
</project>

0 commit comments

Comments
 (0)