This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch branch-2.5 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit eb77a161bae75377157176d7d3737ebd3eb2a1d3 Author: Nick Dimiduk <[email protected]> AuthorDate: Tue Mar 5 09:01:22 2024 +0100 HBASE-28379 Upgrade thirdparty dep to 4.1.6 (#5693) Signed-off-by: Nihal Jain <[email protected]> Signed-off-by: Pankaj Kumar < [email protected]> (cherry picked from commit bd0600257fa4412918326b9e496793ce2392b9fd) --- hbase-shaded/pom.xml | 2 +- pom.xml | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 0bdf4a1223e..b64df3e87e7 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -90,7 +90,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 3a2643ad3a1..79eca16a476 100644 --- a/pom.xml +++ b/pom.xml @@ -583,8 +583,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> @@ -602,7 +606,7 @@ <external.protoc.version>${external.protobuf.version}</external.protoc.version> <!--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> <protobuf.plugin.version>0.6.1</protobuf.plugin.version> <thrift.path>thrift</thrift.path> <thrift.version>0.14.1</thrift.version> @@ -657,7 +661,13 @@ <snappy.version>1.1.10.4</snappy.version> <xz.version>1.9</xz.version> <zstd-jni.version>1.5.5-2</zstd-jni.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> <!-- Coverage properties --> <jacoco.version>0.8.8</jacoco.version> <jacocoArgLine/>
