This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-connectors.git
The following commit(s) were added to refs/heads/master by this push:
new 800161e HBASE-29287 Update HBase version used in connectors to 2.6.2
(#144)
800161e is described below
commit 800161eb39836cca36209f3b79caf87d49af2abd
Author: Istvan Toth <[email protected]>
AuthorDate: Mon May 12 12:19:08 2025 +0200
HBASE-29287 Update HBase version used in connectors to 2.6.2 (#144)
also update
* hadoop to 3.4.1
* hbase-thirdparty to 4.11.0
* mockito to 4.11.0
* surefire to 3.5.2
* commons-lang to 3.17.0
Co-authored-by: Villő Szűcs <[email protected]>
Signed-off-by: Nihal Jain <[email protected]>
---
.../src/main/resources/supplemental-models.xml | 14 ++++++++
pom.xml | 38 ++++++++++++----------
spark/hbase-spark-it/pom.xml | 38 +++++++++++++++++-----
spark/hbase-spark/pom.xml | 6 +---
4 files changed, 65 insertions(+), 31 deletions(-)
diff --git
a/hbase-connectors-assembly/src/main/resources/supplemental-models.xml
b/hbase-connectors-assembly/src/main/resources/supplemental-models.xml
index 4e2a7aa..3c0a2ad 100644
--- a/hbase-connectors-assembly/src/main/resources/supplemental-models.xml
+++ b/hbase-connectors-assembly/src/main/resources/supplemental-models.xml
@@ -36,4 +36,18 @@ under the License.
</licenses>
</project>
</supplement>
+ <supplement>
+ <project>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.1</version>
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ </project>
+ </supplement>
</supplementalDataModels>
diff --git a/pom.xml b/pom.xml
index dd9ce97..90608e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,16 +136,16 @@
<buildnumber.maven.version>1.4</buildnumber.maven.version>
<maven.min.version>3.5.0</maven.min.version>
- <hbase.version>2.5.4</hbase.version>
+ <hbase.version>2.6.2-hadoop3</hbase.version>
<exec.maven.version>1.6.0</exec.maven.version>
<audience-annotations.version>0.5.0</audience-annotations.version>
<junit.version>4.13.2</junit.version>
- <mockito-all.version>1.8.5</mockito-all.version>
- <hbase-thirdparty.version>4.1.4</hbase-thirdparty.version>
+ <mockito.version>4.11.0</mockito.version>
+ <hbase-thirdparty.version>4.1.10</hbase-thirdparty.version>
<!-- Must match the version in hbase-thirdparty above ! -->
- <thirdparty.protobuf.version>3.21.12</thirdparty.protobuf.version>
+ <thirdparty.protobuf.version>4.29.2</thirdparty.protobuf.version>
<hadoop-two.version>2.10.0</hadoop-two.version>
- <hadoop-three.version>3.2.4</hadoop-three.version>
+ <hadoop-three.version>3.4.1</hadoop-three.version>
<hadoop.version>${hadoop-three.version}</hadoop.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j2.version>2.17.2</log4j2.version>
@@ -154,17 +154,14 @@
<spotless.version>2.27.2</spotless.version>
<maven.checkstyle.version>3.2.1</maven.checkstyle.version>
<hbase.checkstyle.version>2.5.0</hbase.checkstyle.version>
- <surefire.version>3.0.0</surefire.version>
+ <surefire.version>3.5.2</surefire.version>
<enforcer.version>3.0.0</enforcer.version>
<extra.enforcer.version>1.5.1</extra.enforcer.version>
<restrict-imports.enforcer.version>0.14.0</restrict-imports.enforcer.version>
<protobuf.plugin.version>0.5.0</protobuf.plugin.version>
<commons-io.version>2.18.0</commons-io.version>
<avro.version>1.11.4</avro.version>
- <commons-lang3.version>3.12.0</commons-lang3.version>
- <!--This property is for hadoops netty. HBase netty
- comes in via hbase-thirdparty hbase-shaded-netty-->
- <netty.hadoop.version>3.10.6.Final</netty.hadoop.version>
+ <commons-lang3.version>3.17.0</commons-lang3.version>
<os.maven.version>1.6.1</os.maven.version>
<glassfish.el.version>3.0.1-b08</glassfish.el.version>
<compat.module>hbase-hadoop2-compat</compat.module>
@@ -255,9 +252,10 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>${mockito-all.version}</version>
- <scope>test</scope>
+ <artifactId>mockito-bom</artifactId>
+ <version>${mockito.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
@@ -331,20 +329,20 @@
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
+ <artifactId>hbase-mapreduce</artifactId>
<version>${hbase.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-mapreduce</artifactId>
+ <artifactId>hbase-it</artifactId>
<version>${hbase.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-it</artifactId>
<version>${hbase.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -352,6 +350,12 @@
<version>${hbase.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-testing-util</artifactId>
+ <version>${hbase.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
diff --git a/spark/hbase-spark-it/pom.xml b/spark/hbase-spark-it/pom.xml
index 6fed929..d8d548d 100644
--- a/spark/hbase-spark-it/pom.xml
+++ b/spark/hbase-spark-it/pom.xml
@@ -47,7 +47,11 @@
<dependency>
<groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-testing-util</artifactId>
+ <artifactId>hbase-testing-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-it</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -70,7 +74,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>${hadoop-two.version}</version>
+ <version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
@@ -88,8 +92,8 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop-two.version}</version>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>${hadoop-three.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
@@ -98,12 +102,24 @@
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop-three.version}</version>
+ <scope>test</scope>
+ <exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -142,6 +158,10 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-runtime</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-all</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -184,7 +204,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/spark/hbase-spark/pom.xml b/spark/hbase-spark/pom.xml
index ace0def..3b3670b 100644
--- a/spark/hbase-spark/pom.xml
+++ b/spark/hbase-spark/pom.xml
@@ -121,7 +121,7 @@
</dependency>
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -136,10 +136,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-shaded-client</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.hbase.connectors.spark</groupId>
<artifactId>hbase-spark-protocol-shaded</artifactId>
