From 57dbad11da141355c2eec18b7ab610e5f00907e9 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Sat, 23 Oct 2021 20:35:12 +0800
Subject: [PATCH] HBASE-26393 The dockerfile for running pre commit and nightly
 jobs can not be built on branch-1 (#3790)

Signed-off-by: Zhuoyue Huang <huangzhuoyue@apache.org>
---
 dev-support/docker/Dockerfile                         | 11 ++++++-----
 .../regionserver/TestRegionProcessRowsWithLocks.java  |  2 +-
 pom.xml                                               |  2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile
index 5dbe2ba339c..0eb0fc395a1 100644
--- a/dev-support/docker/Dockerfile
+++ b/dev-support/docker/Dockerfile
@@ -19,7 +19,7 @@
 # See BUILDING.txt.
 
 
-FROM ubuntu:trusty
+FROM ubuntu:18.04
 
 WORKDIR /root
 
@@ -63,10 +63,12 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
     pylint \
     python-dateutil \
     rsync \
-    snappy \
+    libsnappy-dev \
     xz-utils \
     zlib1g-dev \
-    wget
+    wget \
+    gpg \
+    dirmngr
 
 ####
 # Apps that require Java.
@@ -90,13 +92,12 @@ RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
 RUN echo "dot_style = mega" > "/root/.wgetrc"
 RUN echo "quiet = on" >> "/root/.wgetrc"
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9
-RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common python-software-properties
+RUN apt-get -q update && apt-get -q install --no-install-recommends -y software-properties-common
 RUN apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main'
 RUN apt-get -q update
 RUN apt-get -q install --no-install-recommends -y zulu-8 zulu-7
 RUN update-alternatives --config java
 RUN update-alternatives --config javac
-RUN mv /usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/moved.java-7-openjdk-amd64
 ENV JAVA_HOME /usr/lib/jvm/zulu-7-amd64
 
 # Fixing the Apache commons / Maven dependency problem under Ubuntu:
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java
index 227faf99ae0..e4c38e72450 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionProcessRowsWithLocks.java
@@ -172,7 +172,7 @@ public class TestRegionProcessRowsWithLocks {
     try {
       incrementCounter(table);
       Assert.fail("Should throw IOException.");
-    } catch (Throwable e) {
+    } catch (IOException e) {
     }
 
     long endMemstoreSize = region.getMemstoreSize();
diff --git a/pom.xml b/pom.xml
index 8a266e8a543..d9ef8868978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,6 +739,8 @@
               <exclude>**/rat.txt</exclude>
               <!-- hbase-error-prone module is in a profile which is not used for rat check -->
               <exclude>hbase-error-prone/target/**</exclude>
+              <!-- when using jdk7, hbase-thrift module will not be used for rat check -->
+              <exclude>hbase-thrift/target/**</exclude>
             </excludes>
           </configuration>
         </plugin>