Skip to content

Commit 94b8ceb

Browse files
Dependencies upgrade and native build cleaning (#84)
1 parent 3b5cb94 commit 94b8ceb

7 files changed

Lines changed: 33 additions & 31 deletions

File tree

pom.xml

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
<quarkus.package.jar.type>fast-jar</quarkus.package.jar.type>
1313
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1414
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
15-
<quarkus.platform.version>3.25.4</quarkus.platform.version>
15+
<quarkus.platform.version>3.30.6</quarkus.platform.version>
1616
<skipITs>true</skipITs>
1717
<surefire-plugin.version>3.5.3</surefire-plugin.version>
18-
<confluent.version>7.9.1</confluent.version>
18+
<confluent.version>8.1.1</confluent.version>
1919
<testcontainers.version>1.21.3</testcontainers.version>
2020
<sonar-maven-plugin.version>5.2.0.4988</sonar-maven-plugin.version>
2121
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>
2222
<checkstyle-maven-plugin.version>3.6.0</checkstyle-maven-plugin.version>
23+
<bouncycastle.jdk18on.version>1.82</bouncycastle.jdk18on.version>
2324
</properties>
2425

2526
<repositories>
@@ -70,6 +71,10 @@
7071
<groupId>io.quarkus</groupId>
7172
<artifactId>quarkus-container-image-docker</artifactId>
7273
</dependency>
74+
<dependency>
75+
<groupId>io.quarkus</groupId>
76+
<artifactId>quarkus-jackson</artifactId>
77+
</dependency>
7378
<dependency>
7479
<groupId>io.quarkus</groupId>
7580
<artifactId>quarkus-junit5</artifactId>
@@ -105,6 +110,11 @@
105110
<artifactId>kafka-json-schema-serializer</artifactId>
106111
<version>${confluent.version}</version>
107112
</dependency>
113+
<dependency>
114+
<groupId>org.brotli</groupId>
115+
<artifactId>dec</artifactId>
116+
<version>0.1.2</version>
117+
</dependency>
108118
<dependency>
109119
<groupId>io.confluent</groupId>
110120
<artifactId>kafka-protobuf-serializer</artifactId>
@@ -118,42 +128,38 @@
118128
<dependency>
119129
<groupId>com.fasterxml.jackson.dataformat</groupId>
120130
<artifactId>jackson-dataformat-yaml</artifactId>
121-
<version>2.20.1</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>com.fasterxml.jackson.dataformat</groupId>
134+
<artifactId>jackson-dataformat-csv</artifactId>
122135
</dependency>
123136
<dependency>
124137
<groupId>org.testcontainers</groupId>
125138
<artifactId>testcontainers</artifactId>
126139
<version>${testcontainers.version}</version>
127-
<exclusions>
128-
<exclusion>
129-
<groupId>com.github.docker-java</groupId>
130-
<artifactId>docker-java-api</artifactId>
131-
</exclusion>
132-
<exclusion>
133-
<groupId>com.github.docker-java</groupId>
134-
<artifactId>docker-java-transport-zerodep</artifactId>
135-
</exclusion>
136-
</exclusions>
140+
<scope>test</scope>
137141
</dependency>
138142
<dependency>
139143
<groupId>org.testcontainers</groupId>
140144
<artifactId>junit-jupiter</artifactId>
141145
<version>${testcontainers.version}</version>
146+
<scope>test</scope>
142147
</dependency>
143148
<dependency>
144149
<groupId>org.testcontainers</groupId>
145150
<artifactId>kafka</artifactId>
146151
<version>${testcontainers.version}</version>
152+
<scope>test</scope>
147153
</dependency>
148154
<dependency>
149-
<groupId>com.github.docker-java</groupId>
150-
<artifactId>docker-java-api</artifactId>
151-
<version>3.6.0</version>
155+
<groupId>org.bouncycastle</groupId>
156+
<artifactId>bcprov-jdk18on</artifactId>
157+
<version>${bouncycastle.jdk18on.version}</version>
152158
</dependency>
153159
<dependency>
154-
<groupId>com.github.docker-java</groupId>
155-
<artifactId>docker-java-transport-zerodep</artifactId>
156-
<version>3.6.0</version>
160+
<groupId>org.bouncycastle</groupId>
161+
<artifactId>bctls-jdk18on</artifactId>
162+
<version>${bouncycastle.jdk18on.version}</version>
157163
</dependency>
158164
</dependencies>
159165
<build>

src/main/java/com/michelin/kafkagen/kafka/GenericProducer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ var record = new ProducerRecord<>(topicName,
120120
}
121121
}
122122
});
123+
124+
// Flush to ensure all records are sent before returning
125+
producer.flush();
123126
}
124127

125128
public void producerRandom(String topicName, String avroFile, Long iterations, Integer maxInterval,
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
quarkus.log.level=OFF
22
quarkus.banner.enabled=false
3-
quarkus.native.additional-build-args=\
4-
--initialize-at-build-time=org.apache.avro.reflect.ReflectData\\,org.apache.kafka.common.protocol\\,org.apache.kafka.common.message\\,org.apache.kafka.shaded.com.google.protobuf\\,picocli.CommandLine$Tracer\\,picocli.CommandLine$TraceLevel
53
quarkus.native.march=compatibility
64
quarkus.container-image.group=michelin
75
quarkus.kafka.snappy.enabled=true

src/test/java/com/michelin/kafkagen/AssertSubcommandIntegrationTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ public void callWithFoundAndNotFoundDatasets() throws Exception {
9191

9292
genericProducer.produce("avroTopicWithoutKey", dataset, 1, context);
9393

94-
Thread.sleep(1000);
95-
9694
var assertSubcommand = new AssertSubcommand(configService, datasetService, assertService);
9795
initCommandLine(assertSubcommand);
9896
assertSubcommand.commandSpec = commandSpec;

src/test/java/com/michelin/kafkagen/DatasetSubcommandIntegrationTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ public void callWithDifferentOffsetRequests() throws Exception {
9999
// Partition 2: key1, key2
100100
genericProducer.produce("avroTopicWithoutKey", dataset, 1, context);
101101

102-
Thread.sleep(1000);
103-
104102
var datasetSubcommand = new DatasetSubcommand(configService, schemaService, datasetService);
105103
initCommandLine(datasetSubcommand);
106104
datasetSubcommand.commandSpec = commandSpec;
@@ -141,8 +139,8 @@ public void callWithoutContext() throws Exception {
141139

142140
private void initCommandLine(DatasetSubcommand datasetSubcommand) {
143141
var commandLine = new CommandLine(datasetSubcommand);
144-
commandLine.setOut(new PrintWriter(out));
145-
commandLine.setErr(new PrintWriter(out));
142+
commandLine.setOut(new PrintWriter(out, true));
143+
commandLine.setErr(new PrintWriter(out, true));
146144
Mockito.when(commandSpec.commandLine()).thenReturn(commandLine);
147145
}
148146
}

src/test/java/com/michelin/kafkagen/services/AssertServiceIntegrationTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ public void assertThatTopicContains() throws Exception {
8585

8686
genericProducer.produce("avroTopicWithoutKey", dataset, 1, context);
8787

88-
Thread.sleep(1000);
89-
9088
var rawDataset = datasetService.getRawRecord(new File(getClass().getClassLoader().getResource("avro/expected/assertDataset.json").toURI()));
9189
boolean result = assertService.assertThatTopicContains("avroTopicWithoutKey", rawDataset, new HashMap<>(), context, false, Optional.empty());
9290
assertTrue(result);
@@ -115,8 +113,6 @@ public void assertThatTopicContainsMostRecent() throws Exception {
115113

116114
genericProducer.produce("avroTopicWithoutKey", dataset, 1, context);
117115

118-
Thread.sleep(1000);
119-
120116
var rawDataset = datasetService.getRawRecord(new File(getClass().getClassLoader().getResource("avro/expected/assertDatasetWithoutKey.json").toURI()));
121117
var mostRecentAssertResult = rawDataset.stream()
122118
.filter(r -> r.getMostRecent().equals(true))

src/test/resources/application.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
quarkus.kafka.snappy.enabled=false
22

3+
# Suppress noisy Kafka client connection warnings during tests
4+
quarkus.log.category."org.apache.kafka.clients".level=ERROR
5+
36
kafka.host=kafkaHost
47
kafka.port=9092
58
registry.host=registryHost

0 commit comments

Comments
 (0)