diff --git a/bin/bootstrap_system.sh b/bin/bootstrap_system.sh
index 9d043d017b..fd8f41a306 100755
--- a/bin/bootstrap_system.sh
+++ b/bin/bootstrap_system.sh
@@ -241,19 +241,19 @@ redhat sudo yum clean all
 
 # Download ant for centos
 redhat sudo wget -nv \
-  https://downloads.apache.org/ant/binaries/apache-ant-1.9.14-bin.tar.gz
-redhat sha512sum -c - <<< '487dbd1d7f678a92924ba884a57e910ccb4fe565c554278795a8fdfc80c4e88d81ebc2ccecb5a8f353f0b2076572bb921499a2cadb064e0f44fc406a3c31da20  apache-ant-1.9.14-bin.tar.gz'
-redhat sudo tar -C /usr/local -xzf apache-ant-1.9.14-bin.tar.gz
-redhat sudo ln -s /usr/local/apache-ant-1.9.14/bin/ant /usr/local/bin
+  https://downloads.apache.org/ant/binaries/apache-ant-1.9.16-bin.tar.gz
+redhat sha512sum -c - <<< '8d542a7a636a491e76170148881b6f413f4564aad1ab034f426bd946be93382001862bd6c60865aa2b57b39b9633e0181fe8997dd6323123aaf76b410ec4a366  apache-ant-1.9.16-bin.tar.gz'
+redhat sudo tar -C /usr/local -xzf apache-ant-1.9.16-bin.tar.gz
+redhat sudo ln -sf /usr/local/apache-ant-1.9.16/bin/ant /usr/local/bin
 
 # Download maven for all OSes, since the OS-packaged version can be
 # pretty old.
-if [ ! -d /usr/local/apache-maven-3.5.4 ]; then
+if [ ! -d /usr/local/apache-maven-3.8.8 ]; then
   sudo wget -nv \
-    https://downloads.apache.org/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.tar.gz
-  sha512sum -c - <<< '2a803f578f341e164f6753e410413d16ab60fabe31dc491d1fe35c984a5cce696bc71f57757d4538fe7738be04065a216f3ebad4ef7e0ce1bb4c51bc36d6be86  apache-maven-3.5.4-bin.tar.gz'
-  sudo tar -C /usr/local -xzf apache-maven-3.5.4-bin.tar.gz
-  sudo ln -s /usr/local/apache-maven-3.5.4/bin/mvn /usr/local/bin
+    https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
+  sha512sum -c - <<< '332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00  apache-maven-3.8.8-bin.tar.gz'
+  sudo tar -C /usr/local -xzf apache-maven-3.8.8-bin.tar.gz
+  sudo ln -sf /usr/local/apache-maven-3.8.8/bin/mvn /usr/local/bin
 fi
 
 if ! { service --status-all | grep -E '^ \[ \+ \]  ssh$'; }
diff --git a/fe/pom.xml b/fe/pom.xml
index 84e30bfa65..8503870d5e 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -52,7 +52,7 @@ under the License.
     <dependency>
       <groupId>org.apache.impala</groupId>
       <artifactId>impala-data-source-api</artifactId>
-      <version>${impala.extdatasrc.api.version}</version>
+      <version>3.4.0.7.1.7.1065-1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -140,20 +140,20 @@ under the License.
       <groupId>org.apache.hudi</groupId>
       <artifactId>hudi-hadoop-mr</artifactId>
       <version>${hudi.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.parquet</groupId>
-            <artifactId>parquet-avro</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.apache.hive</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-        </exclusions>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.parquet</groupId>
+          <artifactId>parquet-avro</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.hive</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -195,7 +195,7 @@ under the License.
     <dependency>
       <groupId>org.apache.impala</groupId>
       <artifactId>yarn-extras</artifactId>
-      <version>${yarn-extras.version}</version>
+      <version>3.4.0.7.1.7.1065-1</version>
     </dependency>
 
     <dependency>
@@ -334,7 +334,7 @@ under the License.
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-common</artifactId>
         </exclusion>
-       <exclusion>
+        <exclusion>
           <groupId>org.apache.hive</groupId>
           <artifactId>*</artifactId>
         </exclusion>
@@ -345,12 +345,12 @@ under the License.
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-client</artifactId>
       <version>${hbase.version}</version>
-       <exclusions>
-         <!-- https://issues.apache.org/jira/browse/HADOOP-14903 -->
-         <exclusion>
-           <groupId>net.minidev</groupId>
-           <artifactId>json-smart</artifactId>
-         </exclusion>
+      <exclusions>
+        <!-- https://issues.apache.org/jira/browse/HADOOP-14903 -->
+        <exclusion>
+          <groupId>net.minidev</groupId>
+          <artifactId>json-smart</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -358,12 +358,12 @@ under the License.
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
       <version>${hbase.version}</version>
-       <exclusions>
-         <!-- https://issues.apache.org/jira/browse/HADOOP-14903 -->
-         <exclusion>
-           <groupId>net.minidev</groupId>
-           <artifactId>json-smart</artifactId>
-         </exclusion>
+      <exclusions>
+        <!-- https://issues.apache.org/jira/browse/HADOOP-14903 -->
+        <exclusion>
+          <groupId>net.minidev</groupId>
+          <artifactId>json-smart</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -456,9 +456,9 @@ under the License.
     </dependency>
 
     <dependency>
-        <groupId>com.google.errorprone</groupId>
-        <artifactId>error_prone_annotations</artifactId>
-        <version>2.3.1</version>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+      <version>2.3.1</version>
     </dependency>
 
     <dependency>
@@ -469,9 +469,9 @@ under the License.
     </dependency>
 
     <dependency>
-        <groupId>org.ehcache</groupId>
-        <artifactId>sizeof</artifactId>
-        <version>0.3.0</version>
+      <groupId>org.ehcache</groupId>
+      <artifactId>sizeof</artifactId>
+      <version>0.3.0</version>
     </dependency>
 
     <dependency>
@@ -557,13 +557,13 @@ under the License.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.6</version>
-      <executions>
-        <execution>
-          <goals>
-            <goal>test-jar</goal>
-          </goals>
-        </execution>
-      </executions>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>
@@ -648,14 +648,23 @@ under the License.
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.20</version>
         <configuration>
-          <trimStackTrace>false</trimStackTrace>
-          <reportsDirectory>${surefire.reports.dir}</reportsDirectory>
-          <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <argLine>${surefireJacocoArg}</argLine>
-          <groups>${testcase.groups}</groups>
+          <forkCount>3</forkCount>
+          <reuseForks>true</reuseForks>
+          <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+          <!--          <trimStackTrace>false</trimStackTrace>-->
+          <!--          <reportsDirectory>${surefire.reports.dir}</reportsDirectory>-->
+          <!--          <redirectTestOutputToFile>true</redirectTestOutputToFile>-->
+
+          <!--          <groups>${testcase.groups}</groups>-->
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <testFailureIgnore>true</testFailureIgnore>
         </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -677,7 +686,7 @@ under the License.
                 <source>${project.basedir}/generated-sources/gen-java</source>
                 <source>${project.build.directory}/generated-sources/cup</source>
                 <source>${project.basedir}/src/compat-hive-${hive.major.version}/java</source>
-               </sources>
+              </sources>
             </configuration>
           </execution>
         </executions>
@@ -702,7 +711,7 @@ under the License.
             <id>jacoco-report</id>
             <phase>test</phase>
             <goals>
-             <goal>report</goal>
+              <goal>report</goal>
             </goals>
             <configuration>
               <dataFile>${jacoco.data.file}</dataFile>
@@ -920,14 +929,14 @@ under the License.
               <groupId>org.apache.calcite.avatica</groupId>
               <artifactId>avatica</artifactId>
             </exclusion>
-          <exclusion>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>ant</groupId>
-            <artifactId>*</artifactId>
-          </exclusion>
+            <exclusion>
+              <groupId>org.eclipse.jetty</groupId>
+              <artifactId>*</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>ant</groupId>
+              <artifactId>*</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
 
@@ -1268,7 +1277,7 @@ under the License.
       <activation>
         <file>
           <exists>${env.THRIFT_HOME}/bin/thrift</exists>
-          </file>
+        </file>
       </activation>
       <properties>
         <thrift.executable>${env.THRIFT_HOME}/bin/thrift</thrift.executable>
@@ -1338,13 +1347,13 @@ under the License.
           <name>m2e.version</name>
         </property>
       </activation>
-        <!-- By default, we separate Eclipse-built files from Maven-built
-             files. Otherwise, they are both in target/classes, and Eclipse
-             and Maven may clobber each other, complicating attaching to
-             a running process. -->
-        <properties>
-          <buildOutputDirectory>${project.build.directory}/${eclipse.output.directory}</buildOutputDirectory>
-        </properties>
+      <!-- By default, we separate Eclipse-built files from Maven-built
+           files. Otherwise, they are both in target/classes, and Eclipse
+           and Maven may clobber each other, complicating attaching to
+           a running process. -->
+      <properties>
+        <buildOutputDirectory>${project.build.directory}/${eclipse.output.directory}</buildOutputDirectory>
+      </properties>
     </profile>
 
     <profile>
diff --git a/impala-parent/pom.xml b/impala-parent/pom.xml
index 7c54e4b06c..b971a9f22e 100644
--- a/impala-parent/pom.xml
+++ b/impala-parent/pom.xml
@@ -46,7 +46,7 @@ under the License.
     <knox.version>${env.IMPALA_KNOX_VERSION}</knox.version>
     <thrift.version>0.9.3-1</thrift.version>
     <impala.extdatasrc.api.version>1.0-SNAPSHOT</impala.extdatasrc.api.version>
-    <impala.query.event.hook.api.version>1.0-SNAPSHOT</impala.query.event.hook.api.version>
+    <impala.query.event.hook.api.version>3.4.0.7.1.7.1065-1</impala.query.event.hook.api.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <kudu.version>${env.IMPALA_KUDU_JAVA_VERSION}</kudu.version>
     <commons-io.version>2.6</commons-io.version>
@@ -143,7 +143,7 @@ under the License.
     </repository>
     <repository>
       <id>cdh.rcs.releases.repo</id>
-      <url>https://repository.cloudera.com/content/groups/cdh-releases-rcs</url>
+      <url>https://repository.cloudera.com/artifactory/cdh-releases-rcs</url>
       <name>CDH Releases Repository</name>
       <snapshots>
         <enabled>true</enabled>
@@ -192,14 +192,7 @@ under the License.
         <enabled>${env.IMPALA_TOOLCHAIN_KUDU_MAVEN_REPOSITORY_ENABLED}</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>cloudera.thirdparty.repo</id>
-      <url>https://repository.cloudera.com/content/repositories/third-party</url>
-      <name>Cloudera Third Party Repository</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
+
     <repository>
       <!--
       HWX Nexus is disabled. This is a tombstone to list out why:
@@ -232,9 +225,9 @@ under the License.
   </repositories>
   <pluginRepositories>
     <pluginRepository>
-      <id>cloudera.thirdparty.repo</id>
-      <url>https://repository.cloudera.com/content/repositories/third-party</url>
-      <name>Cloudera Third Party Repository</name>
+      <id>cdh.rcs.releases.repo</id>
+      <url>https://repository.cloudera.com/artifactory/cdh-releases-rcs</url>
+      <name>CDH Releases Repository</name>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>