Skip to content

Commit ee6e83d

Browse files
aanejaZacBlancoimjalpreet
authored and
rschlussel
committed
Upgrade Kafka version to 3.9.0
Co-authored-by: Zac Blanco <[email protected]> Co-authored-by: Jalpreet Singh Nanda (:imjalpreet) <[email protected]>
1 parent 5d66959 commit ee6e83d

File tree

6 files changed

+178
-91
lines changed

6 files changed

+178
-91
lines changed

‎pom.xml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<!-- Changing joda version changes tzdata which must match deployed JVM tzdata
5757
Do not change this without also making sure it matches -->
5858
<dep.joda.version>2.12.7</dep.joda.version>
59-
<dep.tempto.version>1.53</dep.tempto.version>
59+
<dep.tempto.version>1.54</dep.tempto.version>
6060
<dep.testng.version>7.5</dep.testng.version>
6161
<dep.lucene.version>8.10.0</dep.lucene.version>
6262
<dep.assertj-core.version>3.8.0</dep.assertj-core.version>
@@ -67,7 +67,7 @@
6767
<dep.gcs.version>1.9.17</dep.gcs.version>
6868
<dep.alluxio.version>313</dep.alluxio.version>
6969
<dep.slf4j.version>1.7.32</dep.slf4j.version>
70-
<dep.kafka.version>2.3.1</dep.kafka.version>
70+
<dep.kafka.version>3.9.0</dep.kafka.version>
7171
<dep.pinot.version>0.11.0</dep.pinot.version>
7272
<dep.druid.version>30.0.1</dep.druid.version>
7373
<dep.jaxb.version>2.3.1</dep.jaxb.version>
@@ -1369,7 +1369,7 @@
13691369
<dependency>
13701370
<groupId>org.pcollections</groupId>
13711371
<artifactId>pcollections</artifactId>
1372-
<version>2.1.2</version>
1372+
<version>4.0.2</version>
13731373
</dependency>
13741374

13751375
<dependency>
@@ -2180,6 +2180,10 @@
21802180
<groupId>com.google.inject.extensions</groupId>
21812181
<artifactId>guice-multibindings</artifactId>
21822182
</exclusion>
2183+
<exclusion>
2184+
<groupId>org.testng</groupId>
2185+
<artifactId>testng</artifactId>
2186+
</exclusion>
21832187
</exclusions>
21842188
</dependency>
21852189

@@ -2192,6 +2196,10 @@
21922196
<groupId>com.datastax.cassandra</groupId>
21932197
<artifactId>cassandra-driver-core</artifactId>
21942198
</exclusion>
2199+
<exclusion>
2200+
<groupId>org.testng</groupId>
2201+
<artifactId>testng</artifactId>
2202+
</exclusion>
21952203
</exclusions>
21962204
</dependency>
21972205

@@ -2208,6 +2216,10 @@
22082216
<groupId>org.slf4j</groupId>
22092217
<artifactId>slf4j-log4j12</artifactId>
22102218
</exclusion>
2219+
<exclusion>
2220+
<groupId>org.testng</groupId>
2221+
<artifactId>testng</artifactId>
2222+
</exclusion>
22112223
</exclusions>
22122224
</dependency>
22132225

@@ -2220,6 +2232,14 @@
22202232
<groupId>com.datastax.cassandra</groupId>
22212233
<artifactId>cassandra-driver-core</artifactId>
22222234
</exclusion>
2235+
<exclusion>
2236+
<groupId>commons-cli</groupId>
2237+
<artifactId>commons-cli</artifactId>
2238+
</exclusion>
2239+
<exclusion>
2240+
<groupId>org.testng</groupId>
2241+
<artifactId>testng</artifactId>
2242+
</exclusion>
22232243
</exclusions>
22242244
</dependency>
22252245

‎presto-kafka/pom.xml

Lines changed: 85 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,27 @@
6060

6161
<dependency>
6262
<groupId>org.apache.kafka</groupId>
63-
<artifactId>kafka_2.12</artifactId>
63+
<artifactId>kafka-clients</artifactId>
6464
</dependency>
6565

6666
<dependency>
67-
<groupId>org.apache.kafka</groupId>
68-
<artifactId>kafka-clients</artifactId>
67+
<groupId>org.apache.zookeeper</groupId>
68+
<artifactId>zookeeper</artifactId>
69+
<scope>runtime</scope>
70+
<!-- This is the version used by kafka tranitively -->
71+
<version>3.8.4</version>
72+
<exclusions>
73+
<exclusion>
74+
<groupId>ch.qos.logback</groupId>
75+
<artifactId>logback-core</artifactId>
76+
</exclusion>
77+
<exclusion>
78+
<groupId>ch.qos.logback</groupId>
79+
<artifactId>logback-classic</artifactId>
80+
</exclusion>
81+
</exclusions>
6982
</dependency>
7083

71-
7284
<dependency>
7385
<groupId>javax.inject</groupId>
7486
<artifactId>javax.inject</artifactId>
@@ -144,11 +156,6 @@
144156
<scope>runtime</scope>
145157
</dependency>
146158

147-
<dependency>
148-
<groupId>org.apache.zookeeper</groupId>
149-
<artifactId>zookeeper</artifactId>
150-
<scope>runtime</scope>
151-
</dependency>
152159

153160
<dependency>
154161
<groupId>com.101tec</groupId>
@@ -174,6 +181,58 @@
174181
<scope>test</scope>
175182
</dependency>
176183

184+
<!-- Dependencies required for EmbeddedKafka -->
185+
<dependency>
186+
<groupId>org.apache.kafka</groupId>
187+
<artifactId>kafka_2.12</artifactId>
188+
<version>${dep.kafka.version}</version>
189+
<classifier>test</classifier>
190+
<scope>test</scope>
191+
<exclusions>
192+
<exclusion>
193+
<groupId>commons-logging</groupId>
194+
<artifactId>commons-logging</artifactId>
195+
</exclusion>
196+
</exclusions>
197+
</dependency>
198+
199+
<dependency>
200+
<groupId>org.apache.kafka</groupId>
201+
<artifactId>kafka_2.12</artifactId>
202+
<version>${dep.kafka.version}</version>
203+
<scope>test</scope>
204+
<exclusions>
205+
<exclusion>
206+
<groupId>commons-logging</groupId>
207+
<artifactId>commons-logging</artifactId>
208+
</exclusion>
209+
</exclusions>
210+
</dependency>
211+
212+
<dependency>
213+
<groupId>org.apache.kafka</groupId>
214+
<artifactId>kafka-clients</artifactId>
215+
<version>${dep.kafka.version}</version>
216+
<classifier>test</classifier>
217+
<scope>test</scope>
218+
</dependency>
219+
220+
<dependency>
221+
<groupId>org.apache.kafka</groupId>
222+
<artifactId>kafka-server-common</artifactId>
223+
<version>${dep.kafka.version}</version>
224+
<classifier>test</classifier>
225+
<scope>test</scope>
226+
</dependency>
227+
228+
<dependency>
229+
<groupId>org.junit.jupiter</groupId>
230+
<artifactId>junit-jupiter</artifactId>
231+
<version>5.10.2</version>
232+
<scope>test</scope>
233+
</dependency>
234+
<!-- Dependencies required for EmbeddedKafka -->
235+
177236
<dependency>
178237
<groupId>org.testng</groupId>
179238
<artifactId>testng</artifactId>
@@ -241,13 +300,30 @@
241300
<plugin>
242301
<groupId>org.apache.maven.plugins</groupId>
243302
<artifactId>maven-surefire-plugin</artifactId>
303+
<dependencies>
304+
<dependency>
305+
<groupId>org.apache.maven.surefire</groupId>
306+
<artifactId>surefire-testng</artifactId>
307+
<version>3.0.0-M7</version>
308+
</dependency>
309+
</dependencies>
244310
<configuration>
245311
<!-- integration tests take a very long time so only run them in the CI server -->
246312
<excludes>
247313
<exclude>**/TestKafkaDistributed.java</exclude>
248314
</excludes>
249315
</configuration>
250316
</plugin>
317+
<plugin>
318+
<groupId>org.basepom.maven</groupId>
319+
<artifactId>duplicate-finder-maven-plugin</artifactId>
320+
<configuration>
321+
<ignoredResourcePatterns combine.children="append">
322+
<ignoredResourcePattern>kafka/kafka-version.properties</ignoredResourcePattern>
323+
<ignoredResourcePattern>log4j.properties</ignoredResourcePattern>
324+
</ignoredResourcePatterns>
325+
</configuration>
326+
</plugin>
251327
</plugins>
252328
</build>
253329

‎presto-kafka/src/test/java/com/facebook/presto/kafka/TestMinimalFunctionality.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,10 @@ public void spinUp()
9090
@AfterMethod(alwaysRun = true)
9191
public void tearDown()
9292
{
93-
queryRunner.close();
94-
queryRunner = null;
93+
if (queryRunner != null) {
94+
queryRunner.close();
95+
queryRunner = null;
96+
}
9597
}
9698

9799
private void createMessages(String topicName, int count)

0 commit comments

Comments
 (0)