This is an automated email from the ASF dual-hosted git repository.
stevel pushed a commit to branch branch-1.5.0
in repository https://gitbox.apache.org/repos/asf/hadoop-thirdparty.git
The following commit(s) were added to refs/heads/branch-1.5.0 by this push:
new f38cd43 HADOOP-19694. Followup: restore shaded org.checkerframework
classes
f38cd43 is described below
commit f38cd430aa2a17bd404d90a5f2ca2e2116b22ae4
Author: Steve Loughran <[email protected]>
AuthorDate: Mon Oct 20 18:00:18 2025 +0100
HADOOP-19694. Followup: restore shaded org.checkerframework classes
The updated guava version of HADOOP-19694 dropped a dependency on
org.checkerframework:checker-qual...there are a limited number
of places in the hadoop code which uses their @Nullable/@NonNullable
annotations, shaded under
o.a.h.thirdparty.org.checkerframework
These classes now stop compiling.
Adding checker-qual 3.51.1 as a dependency of hadoop-shaded-guava
restores the build.
---
LICENSE-binary | 2 +-
hadoop-shaded-guava/pom.xml | 9 +++++++++
pom.xml | 2 ++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index 411cc6d..8e348be 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -225,4 +225,4 @@ com.google.protobuf:protobuf-java:3.25.5
MIT License
-----------
-org.checkerframework:checker-qual:jar:3.8.0
+org.checkerframework:checker-qual:jar:3.51.1
diff --git a/hadoop-shaded-guava/pom.xml b/hadoop-shaded-guava/pom.xml
index 1bf0eed..68ba70c 100644
--- a/hadoop-shaded-guava/pom.xml
+++ b/hadoop-shaded-guava/pom.xml
@@ -30,6 +30,10 @@
<artifactId>hadoop-shaded-guava</artifactId>
<name>Apache Hadoop shaded Guava</name>
<packaging>jar</packaging>
+ <description>
+ Contains a shaded version of guava and its dependencies.
+
+ </description>
<dependencies>
<dependency>
@@ -43,6 +47,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ <version>${checkerframework.version}</version>
+ </dependency>
</dependencies>
<build>
diff --git a/pom.xml b/pom.xml
index b1dd58e..e642b61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,8 @@
<protobuf.shade.prefix>${shaded.prefix}.protobuf</protobuf.shade.prefix>
<protobuf_3.version>3.25.5</protobuf_3.version>
<guava.version>33.4.8-jre</guava.version>
+ <!-- previous versions of guava included this, but they've stopped it. We
reinsert it to the shaded guava artifact-->
+ <checkerframework.version>3.51.1</checkerframework.version>
<avro.version>1.11.4</avro.version>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
