Skip to content

Commit 557759e

Browse files
committed
fix hbase-operator-tools build
1 parent 8fce049 commit 557759e

File tree

3 files changed

+58
-2
lines changed

3 files changed

+58
-2
lines changed

hbase/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ mvn \
161161
--no-transfer-progress \
162162
-Dhbase.version=${PRODUCT} \
163163
-Dhbase-thirdparty.version=${HBASE_THIRDPARTY} \
164-
-DskipTests \
164+
-Dmaven.tests.skip=true \
165165
package assembly:single
166166

167167
# We need the "*" here as the directory won't be the same as the final tar file for SNAPSHOTs which we currently have to use for 2.6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
From f9e952767faf3032c0d4e729e51b5901fcf1a0e1 Mon Sep 17 00:00:00 2001
2+
From: Razvan-Daniel Mihai <[email protected]>
3+
Date: Tue, 6 May 2025 17:58:34 +0200
4+
Subject: Exclude hbase-testing-utils dependency from the build.
5+
6+
---
7+
hbase-hbck2/pom.xml | 11 +++++++++--
8+
hbase-tools/pom.xml | 5 +++--
9+
2 files changed, 12 insertions(+), 4 deletions(-)
10+
11+
diff --git a/hbase-hbck2/pom.xml b/hbase-hbck2/pom.xml
12+
index 1d57225..fd0018c 100644
13+
--- a/hbase-hbck2/pom.xml
14+
+++ b/hbase-hbck2/pom.xml
15+
@@ -114,12 +114,19 @@
16+
</exclusion>
17+
</exclusions>
18+
</dependency>
19+
- <dependency>
20+
+ <!-- Starting with Hbase 2.6.2, this brings in a dependency that is not publicly available:
21+
+ org.apache.directory.jdbm:apacheds-jdbm1:bundle:2.0.0-M2
22+
+
23+
+ Since we do not run the tests, we exclude this dependency.
24+
+
25+
+ To build successfully we also need to use -Dmaven.test.skip=true to skip building the tests.
26+
+ -->
27+
+ <!-- dependency>
28+
<groupId>org.apache.hbase</groupId>
29+
<artifactId>hbase-testing-util</artifactId>
30+
<version>${hbase.version}</version>
31+
<scope>test</scope>
32+
- </dependency>
33+
+ </dependency -->
34+
<dependency>
35+
<groupId>org.mockito</groupId>
36+
<artifactId>mockito-core</artifactId>
37+
diff --git a/hbase-tools/pom.xml b/hbase-tools/pom.xml
38+
index 55ef075..eeebe14 100644
39+
--- a/hbase-tools/pom.xml
40+
+++ b/hbase-tools/pom.xml
41+
@@ -103,12 +103,13 @@
42+
</exclusion>
43+
</exclusions>
44+
</dependency>
45+
- <dependency>
46+
+ <!-- See the hbase-hbck2/pom.xml for an explanation of why this is commented out -->
47+
+ <!-- dependency>
48+
<groupId>org.apache.hbase</groupId>
49+
<artifactId>hbase-testing-util</artifactId>
50+
<version>${hbase.version}</version>
51+
<scope>test</scope>
52+
- </dependency>
53+
+ </dependency -->
54+
<dependency>
55+
<groupId>org.mockito</groupId>
56+
<artifactId>mockito-core</artifactId>

hbase/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
{
2525
"product": "2.6.2",
26-
"hbase_thirdparty": "4.1.9",
26+
"hbase_thirdparty": "4.1.10",
2727
"hbase_operator_tools": "1.3.0-fd5a5fb",
2828
"java-base": "11",
2929
"java-devel": "11",

0 commit comments

Comments
 (0)