03-HBASE-28379.patch

HBASE-28379 Upgrade thirdparty dep to 4.1.6

From: Lars Francke <git@lars-francke.de>


---
 hbase-protocol-shaded/pom.xml |    2 +-
 hbase-shaded/pom.xml          |    2 +-
 pom.xml                       |   16 +++++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index c77dc74f8c..b73c0cfa68 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -34,7 +34,7 @@
     <!--Version of protobuf that hbase uses internally (we shade our pb)
          Must match what is out in hbase-thirdparty include.
     -->
-    <internal.protobuf.version>3.24.3</internal.protobuf.version>
+    <internal.protobuf.version>3.25.2</internal.protobuf.version>
   </properties>
   <dependencies>
     <!--BE CAREFUL! Any dependency added here needs to be
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 43449b9b92..5f4f620b71 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -85,7 +85,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.4.1</version>
+          <version>3.5.1</version>
           <executions>
             <execution>
               <id>aggregate-into-a-jar-with-relocated-third-parties</id>
diff --git a/pom.xml b/pom.xml
index 80b9bef71e..5e7aa033da 100755
--- a/pom.xml
+++ b/pom.xml
@@ -579,8 +579,12 @@
     <httpclient.version>4.5.13</httpclient.version>
     <httpcore.version>4.4.13</httpcore.version>
     <metrics-core.version>3.2.6</metrics-core.version>
-    <jackson.version>2.15.2</jackson.version>
-    <jackson.databind.version>2.15.2</jackson.databind.version>
+    <!--
+      Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
+      version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
+    -->
+    <jackson.version>2.16.1</jackson.version>
+    <jackson.databind.version>2.16.1</jackson.databind.version>
     <jaxb-api.version>2.3.1</jaxb-api.version>
     <servlet.api.version>3.1.0</servlet.api.version>
     <wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -641,7 +645,13 @@
     <wagon.ssh.version>2.12</wagon.ssh.version>
     <xml.maven.version>1.0.1</xml.maven.version>
     <spotless.version>2.27.2</spotless.version>
-    <hbase-thirdparty.version>4.1.5</hbase-thirdparty.version>
+    <!--
+        Note that the version of protobuf shipped in hbase-thirdparty must match the version used
+        in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
+        databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
+        hbase-thirdparty.
+    -->
+    <hbase-thirdparty.version>4.1.6</hbase-thirdparty.version>
     <maven-site.version>3.12.0</maven-site.version>
     <snappy.version>1.1.10.4</snappy.version>
     <!-- Coverage properties -->