|
| 1 | +From aecdd61fa521da9a3683b9e03c76f7019996b86a Mon Sep 17 00:00:00 2001 |
| 2 | +From: Maxi Wittich <maximilian.wittich@stackable.tech> |
| 3 | +Date: Fri, 19 Jun 2026 12:22:37 +0200 |
| 4 | +Subject: Add jcip-annotations dependency for Hadoop 3.4.3 compatibility |
| 5 | + |
| 6 | +When upgrading Hadoop from 3.4.2 to 3.4.3, jcip-annotations is no longer |
| 7 | + pulled in transitively. BuiltInProviderSelector.java imports |
| 8 | + net.jcip.annotations.NotThreadSafe, so we must declare the dependency |
| 9 | + explicitly. Matches the fix HBase 2.6.6 upstream. |
| 10 | +--- |
| 11 | + hbase-client/pom.xml | 6 ++++++ |
| 12 | + hbase-server/pom.xml | 6 ++++++ |
| 13 | + pom.xml | 6 ++++++ |
| 14 | + 3 files changed, 18 insertions(+) |
| 15 | + |
| 16 | +diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml |
| 17 | +index 54a3b2baed..165526b7de 100644 |
| 18 | +--- a/hbase-client/pom.xml |
| 19 | ++++ b/hbase-client/pom.xml |
| 20 | +@@ -89,6 +89,12 @@ |
| 21 | + <scope>compile</scope> |
| 22 | + <optional>true</optional> |
| 23 | + </dependency> |
| 24 | ++ <dependency> |
| 25 | ++ <groupId>com.github.stephenc.jcip</groupId> |
| 26 | ++ <artifactId>jcip-annotations</artifactId> |
| 27 | ++ <scope>compile</scope> |
| 28 | ++ <optional>true</optional> |
| 29 | ++ </dependency> |
| 30 | + <dependency> |
| 31 | + <groupId>commons-codec</groupId> |
| 32 | + <artifactId>commons-codec</artifactId> |
| 33 | +diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml |
| 34 | +index 64e3c3a477..2bf30fdb5d 100644 |
| 35 | +--- a/hbase-server/pom.xml |
| 36 | ++++ b/hbase-server/pom.xml |
| 37 | +@@ -197,6 +197,12 @@ |
| 38 | + <scope>compile</scope> |
| 39 | + <optional>true</optional> |
| 40 | + </dependency> |
| 41 | ++ <dependency> |
| 42 | ++ <groupId>com.github.stephenc.jcip</groupId> |
| 43 | ++ <artifactId>jcip-annotations</artifactId> |
| 44 | ++ <scope>compile</scope> |
| 45 | ++ <optional>true</optional> |
| 46 | ++ </dependency> |
| 47 | + <dependency> |
| 48 | + <groupId>com.github.ben-manes.caffeine</groupId> |
| 49 | + <artifactId>caffeine</artifactId> |
| 50 | +diff --git a/pom.xml b/pom.xml |
| 51 | +index 568bc41540..ce780c04c9 100644 |
| 52 | +--- a/pom.xml |
| 53 | ++++ b/pom.xml |
| 54 | +@@ -658,6 +658,7 @@ |
| 55 | + <maven-owasp-plugin.version>12.1.0</maven-owasp-plugin.version> |
| 56 | + <os.maven.version>1.7.1</os.maven.version> |
| 57 | + <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version> |
| 58 | ++ <jcip-annotations.version>1.0-1</jcip-annotations.version> |
| 59 | + <spotbugs.version>4.7.3</spotbugs.version> |
| 60 | + <spotbugs.maven.version>4.7.3.6</spotbugs.maven.version> |
| 61 | + <surefire.version>3.5.3</surefire.version> |
| 62 | +@@ -1142,6 +1143,11 @@ |
| 63 | + <artifactId>findbugs-annotations</artifactId> |
| 64 | + <version>${findbugs-annotations.version}</version> |
| 65 | + </dependency> |
| 66 | ++ <dependency> |
| 67 | ++ <groupId>com.github.stephenc.jcip</groupId> |
| 68 | ++ <artifactId>jcip-annotations</artifactId> |
| 69 | ++ <version>${jcip-annotations.version}</version> |
| 70 | ++ </dependency> |
| 71 | + <!-- |
| 72 | + Logging dependencies. In general, we use slf4j as the log facade in HBase, so all sub |
| 73 | + modules should depend on slf4j-api at compile scope, and then depend on log4j-slf4j-impl |
0 commit comments