Skip to content

Commit 6e5af47

Browse files
davidradldavidradl
committed
HTTP155 use java 21 version of byte-buddy
Signed-off-by: davidradl <[email protected]>
1 parent 6659b81 commit 6e5af47

File tree

2 files changed

+80
-74
lines changed

2 files changed

+80
-74
lines changed

‎flink-connector-http/pom.xml

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,32 @@ under the License.
211211
<scope>test</scope>
212212
</dependency>
213213

214+
<dependency>
215+
<groupId>net.bytebuddy</groupId>
216+
<artifactId>byte-buddy</artifactId>
217+
<scope>test</scope>
218+
</dependency>
219+
220+
<dependency>
221+
<groupId>org.mockito</groupId>
222+
<artifactId>mockito-junit-jupiter</artifactId>
223+
<version>${mockito.version}</version>
224+
<scope>test</scope>
225+
</dependency>
226+
227+
<dependency>
228+
<groupId>org.mockito</groupId>
229+
<artifactId>mockito-core</artifactId>
230+
<version>${mockito.version}</version>
231+
<scope>test</scope>
232+
</dependency>
233+
234+
<dependency>
235+
<groupId>org.mockito</groupId>
236+
<artifactId>mockito-inline</artifactId>
237+
<version>${mockito-inline.version}</version>
238+
<scope>test</scope>
239+
</dependency>
214240
<dependency>
215241
<groupId>org.apache.flink</groupId>
216242
<artifactId>flink-clients</artifactId>
@@ -256,27 +282,6 @@ under the License.
256282
<scope>test</scope>
257283
</dependency>
258284

259-
<dependency>
260-
<groupId>org.mockito</groupId>
261-
<artifactId>mockito-junit-jupiter</artifactId>
262-
<version>${mockito.version}</version>
263-
<scope>test</scope>
264-
</dependency>
265-
266-
<dependency>
267-
<groupId>org.mockito</groupId>
268-
<artifactId>mockito-core</artifactId>
269-
<version>${mockito.version}</version>
270-
<scope>test</scope>
271-
</dependency>
272-
273-
<dependency>
274-
<groupId>org.mockito</groupId>
275-
<artifactId>mockito-inline</artifactId>
276-
<version>${mockito-inline.version}</version>
277-
<scope>test</scope>
278-
</dependency>
279-
280285
<dependency>
281286
<groupId>org.junit.jupiter</groupId>
282287
<artifactId>junit-jupiter-api</artifactId>
@@ -424,7 +429,8 @@ under the License.
424429
<ignoreAllNonTestScoped>true</ignoreAllNonTestScoped>
425430
<ignoredDependencies>
426431
<!--These dependencies are required for the unit tests to succeed -->
427-
<ignoredDependency>org.mockito:mockito-inline:jar:4.6.1</ignoredDependency>
432+
<ignoredDependency>org.mockito:mockito-inline:jar:5.2.0</ignoredDependency>
433+
<ignoredDependency>net.bytebuddy:byte-buddy:jar:1.14.17</ignoredDependency>
428434
<ignoredDependency>com.google.guava:guava:jar:27.0-jre</ignoredDependency>
429435
<ignoredDependency>org.apache.flink:flink-clients:jar:1.20.1</ignoredDependency>
430436
<ignoredUnusedDeclaredDependencies>org.apache.flink:flink-table-planner_${scala.binary.version}

‎pom.xml

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ under the License.
9090
<junit.jupiter.version>${junit5.version}</junit.jupiter.version>
9191
<assertj.core.version>3.23.1</assertj.core.version>
9292
<flink.parent.artifactId>flink-connector-http-parent</flink.parent.artifactId>
93-
<!-- TODO remove mockito dependency -->
94-
<mockito.version>4.6.1</mockito.version>
95-
<mockito-inline.version>4.6.1</mockito-inline.version>
93+
<!-- TODO remove mockito dependency 4.6.1 use level that supports java 21-->
94+
<mockito.version>5.2.0</mockito.version>
95+
<mockito-inline.version>5.2.0</mockito-inline.version>
96+
<!-- explicitly include a java 21 supporting version of byte buddy -->
97+
<bytebuddy.version>1.14.17</bytebuddy.version>
9698
<wiremock.version>2.27.2</wiremock.version>
9799
<maven.shade.plugin.version>3.1.1</maven.shade.plugin.version>
98100
<resilence4j.version>1.7.1</resilence4j.version>
@@ -163,12 +165,7 @@ under the License.
163165
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
164166
<version>${flink.version}</version>
165167
</dependency>
166-
<!-- <dependency>-->
167-
<!-- <groupId>org.apache.flink</groupId>-->
168-
<!-- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>-->
169-
<!-- <version>${flink.version}</version>-->
170-
<!-- <type>test-jar</type>-->
171-
<!-- </dependency>-->
168+
172169
<dependency>
173170
<groupId>org.scala-lang</groupId>
174171
<artifactId>scala-library</artifactId>
@@ -251,25 +248,6 @@ under the License.
251248
<version>1.3.9</version>
252249
</dependency>
253250

254-
<!-- For dependency convergence -->
255-
<!-- <dependency>-->
256-
<!-- <groupId>com.fasterxml.jackson</groupId>-->
257-
<!-- <artifactId>jackson-bom</artifactId>-->
258-
<!-- <type>pom</type>-->
259-
<!-- <scope>import</scope>-->
260-
<!-- <version>${jackson-bom.version}</version>-->
261-
<!-- </dependency>-->
262-
263-
<!-- For dependency convergence -->
264-
<!-- <dependency>-->
265-
<!-- <groupId>org.junit</groupId>-->
266-
<!-- <artifactId>junit-bom</artifactId>-->
267-
<!-- <version>${junit5.version}</version>-->
268-
<!-- <type>pom</type>-->
269-
<!-- <scope>import</scope>-->
270-
<!-- <optional>true</optional>-->
271-
<!-- </dependency>-->
272-
273251
<!-- direct dependencies -->
274252
<dependency>
275253
<groupId>io.vavr</groupId>
@@ -352,6 +330,11 @@ under the License.
352330
<groupId>org.apache.commons</groupId>
353331
<artifactId>commons-compress</artifactId>
354332
</exclusion>
333+
<!-- exclude low version of byte buddy that dies not support java 21 -->
334+
<exclusion>
335+
<groupId>net.bytebuddy</groupId>
336+
<artifactId>byte-buddy</artifactId>
337+
</exclusion>
355338
</exclusions>
356339
</dependency>
357340

@@ -366,6 +349,43 @@ under the License.
366349
<groupId>org.assertj</groupId>
367350
<artifactId>assertj-core</artifactId>
368351
<version>${assertj.core.version}</version>
352+
<!-- exclude low version of byte buddy that does not support java 21 -->
353+
<exclusions>
354+
<exclusion>
355+
<groupId>net.bytebuddy</groupId>
356+
<artifactId>byte-buddy</artifactId>
357+
</exclusion>
358+
</exclusions>
359+
</dependency>
360+
361+
<dependency>
362+
<groupId>org.junit.jupiter</groupId>
363+
<artifactId>junit-jupiter-api</artifactId>
364+
<version>${junit5.version}</version>
365+
</dependency>
366+
367+
<dependency>
368+
<groupId>org.junit.jupiter</groupId>
369+
<artifactId>junit-jupiter-params</artifactId>
370+
<version>${junit5.version}</version>
371+
</dependency>
372+
373+
<dependency>
374+
<groupId> com.google.guava</groupId>
375+
<artifactId>guava</artifactId>
376+
<version>27.0-jre</version>
377+
</dependency>
378+
379+
<dependency>
380+
<groupId>net.minidev</groupId>
381+
<artifactId>json-smart</artifactId>
382+
<version>2.5.2</version>
383+
</dependency>
384+
385+
<dependency>
386+
<groupId>net.bytebuddy</groupId>
387+
<artifactId>byte-buddy</artifactId>
388+
<version>${bytebuddy.version}</version>
369389
</dependency>
370390

371391
<dependency>
@@ -378,6 +398,10 @@ under the License.
378398
<groupId>org.junit.jupiter</groupId>
379399
<artifactId>junit-jupiter-api</artifactId>
380400
</exclusion>
401+
<exclusion>
402+
<groupId>net.bytebuddy</groupId>
403+
<artifactId>byte-buddy</artifactId>
404+
</exclusion>
381405
</exclusions>
382406
</dependency>
383407

@@ -400,30 +424,6 @@ under the License.
400424
<version>${mockito-inline.version}</version>
401425
</dependency>
402426

403-
<dependency>
404-
<groupId>org.junit.jupiter</groupId>
405-
<artifactId>junit-jupiter-api</artifactId>
406-
<version>${junit5.version}</version>
407-
</dependency>
408-
409-
<dependency>
410-
<groupId>org.junit.jupiter</groupId>
411-
<artifactId>junit-jupiter-params</artifactId>
412-
<version>${junit5.version}</version>
413-
</dependency>
414-
415-
<dependency>
416-
<groupId> com.google.guava</groupId>
417-
<artifactId>guava</artifactId>
418-
<version>27.0-jre</version>
419-
</dependency>
420-
421-
<dependency>
422-
<groupId>net.minidev</groupId>
423-
<artifactId>json-smart</artifactId>
424-
<version>2.5.2</version>
425-
</dependency>
426-
427427
<dependency>
428428
<groupId>com.github.tomakehurst</groupId>
429429
<artifactId>wiremock</artifactId>

0 commit comments

Comments
 (0)