From ed1f33e8304a5ab206c30cbf649a25abd4e84bc5 Mon Sep 17 00:00:00 2001
From: Enrico Olivelli <eolivelli@apache.org>
Date: Thu, 20 May 2021 16:36:24 +0200
Subject: [PATCH]     More fixes about running tests on JDK11 (#9893)

    ### Motivation
    When you are running tests on JDK11 you encounter a lot of issues.
    This patch includes a list of minor fixes that can be grouped.

    Master issue #9578

    ### Modifications
    - Upgrade Mockito to latest version
    - Add  "--add-opens java.base/jdk.internal.loader=ALL-UNNAMED" in order to allow PowerMock to work
    - add JAXB into jcloud provider (we already have it on the classpath in production, it is only in order to let tests run)
    - Upgrade HDFS minicluster to 3.3.0
    - Pin netty-codec-http dependency to the same version of netty (inherited from HDFS client)
    - Use the same version of Jetty for hdfs-offload (old version does not work with JDK11)

cherry picked manually from c94d78215ba469a7fd6f52eb56b6ff55011c457c
---
 pom.xml                            | 4 ++--
 tiered-storage/file-system/pom.xml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e46c0662cebca..615da058ba488 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@ flexible messaging model and an intuitive client API.</description>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <redirectTestOutputToFile>true</redirectTestOutputToFile>
+    <test.additional.args></test.additional.args>
     <testReuseFork>true</testReuseFork>
     <testForkCount>4</testForkCount>
     <testRealAWS>false</testRealAWS>
@@ -143,8 +144,7 @@ flexible messaging model and an intuitive client API.</description>
     <postgresql-jdbc.version>42.2.12</postgresql-jdbc.version>
     <clickhouse-jdbc.version>0.2.4</clickhouse-jdbc.version>
     <mariadb-jdbc.version>2.6.0</mariadb-jdbc.version>
-    <hdfs-offload-version3>3.2.0</hdfs-offload-version3>
-    <org.eclipse.jetty-hdfs-offload>9.3.24.v20180605</org.eclipse.jetty-hdfs-offload>
+    <hdfs-offload-version3>3.3.0</hdfs-offload-version3>
     <elasticsearch.version>7.9.1</elasticsearch.version>
     <presto.version>334</presto.version>
     <flink.version>1.6.0</flink.version>
diff --git a/tiered-storage/file-system/pom.xml b/tiered-storage/file-system/pom.xml
index 18dbd5961d30b..d2372816c62a3 100644
--- a/tiered-storage/file-system/pom.xml
+++ b/tiered-storage/file-system/pom.xml
@@ -80,21 +80,25 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-alpn-conscrypt-server</artifactId>
+            <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
+            <version>${jetty.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>