From 018646c2425d8b3b64ab05919b6ef1673daa953b Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Wed, 26 May 2021 03:22:40 +0000
Subject: [PATCH 1/3] HBASE-25920 WIP. Test patch for Hadoop 3.3.1 support

---
 hbase-common/pom.xml                     |  6 ++++++
 hbase-shaded/hbase-shaded-client/pom.xml |  1 +
 hbase-shaded/pom.xml                     |  1 +
 pom.xml                                  | 15 ++++++++++++++-
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
index fdefb6175d97..e49e2a0b7c6a 100644
--- a/hbase-common/pom.xml
+++ b/hbase-common/pom.xml
@@ -255,6 +255,12 @@
       <artifactId>kerb-simplekdc</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>compile</scope>
+      <version>1.7.1</version>
+    </dependency>
   </dependencies>
 
   <profiles>
diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml
index 87060756d396..65f2707e3a6f 100644
--- a/hbase-shaded/hbase-shaded-client/pom.xml
+++ b/hbase-shaded/hbase-shaded-client/pom.xml
@@ -59,6 +59,7 @@
                        need not be included -->
                   <exclude>javax.annotation:javax.annotation-api</exclude>
                   <exclude>javax.activation:javax.activation-api</exclude>
+		  <exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
                   <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
                   <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
                   <exclude>jakarta.validation:jakarta.validation-api</exclude>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 5ddd845ac01e..5bfb339f808e 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -146,6 +146,7 @@
                          need not be included -->
                     <exclude>javax.annotation:javax.annotation-api</exclude>
                     <exclude>javax.activation:javax.activation-api</exclude>
+		    <exclude>jakarta.activation:jakarta.activation-api</exclude> <!-- Hadoop 3.3.1 -->
                     <exclude>jakarta.ws.rs:jakarta.ws.rs-api</exclude>
                     <exclude>jakarta.annotation:jakarta.annotation-api</exclude>
                     <exclude>jakarta.validation:jakarta.validation-api</exclude>
diff --git a/pom.xml b/pom.xml
index 6b42b44e2823..2de7cf4622d5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,19 @@
     </license>
   </licenses>
 
+  <repositories>
+    <repository>
+      <id>${distMgmtSnapshotsId}</id>
+      <name>${distMgmtSnapshotsName}</name>
+      <url>${distMgmtSnapshotsUrl}</url>
+    </repository>
+    <repository>
+      <id>hadoop331rc1</id>
+      <name>Hadoop 3.3.1 RC1 repository</name>
+      <url>https://repository.apache.org/content/repositories/orgapachehadoop-1314<url>
+    </repository>
+  </repositories>
+
   <modules>
     <module>hbase-build-configuration</module>
     <module>hbase-replication</module>
@@ -1742,7 +1755,7 @@
     <joni.version>2.1.31</joni.version>
     <jcodings.version>1.0.55</jcodings.version>
     <spy.version>2.12.2</spy.version>
-    <bouncycastle.version>1.60</bouncycastle.version>
+    <bouncycastle.version>1.68</bouncycastle.version>
     <kerby.version>1.0.1</kerby.version>
     <commons-crypto.version>1.0.0</commons-crypto.version>
     <curator.version>4.2.0</curator.version>

From 804dcb192df62ccb0ce816fceb0216b44e8f7527 Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Wed, 26 May 2021 08:49:22 +0000
Subject: [PATCH 2/3] Fix pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2de7cf4622d5..481130c3c7b2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
     <repository>
       <id>hadoop331rc1</id>
       <name>Hadoop 3.3.1 RC1 repository</name>
-      <url>https://repository.apache.org/content/repositories/orgapachehadoop-1314<url>
+      <url>https://repository.apache.org/content/repositories/orgapachehadoop-1314</url>
     </repository>
   </repositories>
 

From d310e799cc1f29b8582c11d2e9438cd669b52e0d Mon Sep 17 00:00:00 2001
From: Wei-Chiu Chuang <weichiu@apache.org>
Date: Wed, 26 May 2021 10:47:49 +0000
Subject: [PATCH 3/3] Use hadoop version 3.3.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 481130c3c7b2..2b100f346f1a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1702,7 +1702,7 @@
     <maven.min.version>3.0.4</maven.min.version>
     <java.min.version>${compileSource}</java.min.version>
     <!-- Dependencies -->
-    <hadoop-three.version>3.1.2</hadoop-three.version>
+    <hadoop-three.version>3.3.1</hadoop-three.version>
     <!-- These must be defined here for downstream build tools that don't look at profiles.
     -->
     <hadoop.version>${hadoop-three.version}</hadoop.version>