From 27723d729e24c670cb10c0682d458114bcdab753 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Fri, 16 Jan 2026 10:54:03 +0100
Subject: [PATCH 1/7] HDDS-14439. Require Java 17 for server components

---
 .github/workflows/ci.yml                                   | 2 +-
 hadoop-hdds/container-service/pom.xml                      | 4 ++++
 hadoop-hdds/framework/pom.xml                              | 4 ++++
 hadoop-hdds/server-scm/pom.xml                             | 1 +
 hadoop-ozone/cli-admin/pom.xml                             | 1 +
 hadoop-ozone/csi/pom.xml                                   | 1 +
 hadoop-ozone/datanode/pom.xml                              | 1 +
 hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml | 4 ++++
 hadoop-ozone/freon/pom.xml                                 | 1 +
 hadoop-ozone/httpfsgateway/pom.xml                         | 1 +
 hadoop-ozone/insight/pom.xml                               | 1 +
 hadoop-ozone/integration-test-recon/pom.xml                | 4 ++++
 hadoop-ozone/integration-test-s3/pom.xml                   | 4 ++++
 hadoop-ozone/integration-test/pom.xml                      | 4 ++++
 hadoop-ozone/interface-storage/pom.xml                     | 5 +++++
 hadoop-ozone/mini-cluster/pom.xml                          | 1 +
 hadoop-ozone/multitenancy-ranger/pom.xml                   | 1 +
 hadoop-ozone/ozone-manager/pom.xml                         | 1 +
 hadoop-ozone/recon-codegen/pom.xml                         | 1 +
 hadoop-ozone/recon/pom.xml                                 | 1 +
 hadoop-ozone/s3-secret-store/pom.xml                       | 1 +
 hadoop-ozone/s3gateway/pom.xml                             | 1 +
 hadoop-ozone/tools/pom.xml                                 | 1 +
 pom.xml                                                    | 1 +
 24 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e6e173ece3e4..06c29d3c657d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -134,7 +134,7 @@ jobs:
     if: needs.build-info.outputs.needs-compile == 'true'
     strategy:
       matrix:
-        java: [ 8, 11, 17 ]
+        java: [ 17 ]
         include:
           - os: ubuntu-24.04
           - java: 21
diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml
index d43ad4d12028..b8762c25dea8 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone HDDS Container Service</name>
   <description>Apache Ozone Distributed Data Store Container Service</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 27654930c412..88d80ca3252e 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone HDDS Server Framework</name>
   <description>Apache Ozone Distributed Data Store Server Framework</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>ch.qos.reload4j</groupId>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index d8cfb03f5b74..5c72a7fc72e3 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/cli-admin/pom.xml b/hadoop-ozone/cli-admin/pom.xml
index e68105141389..656680b8562f 100644
--- a/hadoop-ozone/cli-admin/pom.xml
+++ b/hadoop-ozone/cli-admin/pom.xml
@@ -29,6 +29,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index ea6f8cbad75f..596ea9104234 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index a91604198157..12299243d039 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/pom.xml
@@ -26,6 +26,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
     <spotbugs.skip>true</spotbugs.skip>
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
index 97d3076e889e..d0252ceaf667 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone Mini Ozone Chaos Tests</name>
   <description>Apache Ozone Mini Ozone Chaos Tests</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>info.picocli</groupId>
diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml
index 7e4d7142835a..ce798653ea71 100644
--- a/hadoop-ozone/freon/pom.xml
+++ b/hadoop-ozone/freon/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml
index d4df054b4da4..9ee469d37af9 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -34,6 +34,7 @@
     <httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
     <httpfs.source.revision>REVISION NOT AVAIL</httpfs.source.revision>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index df338e221eda..478037654a98 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -28,6 +28,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/integration-test-recon/pom.xml b/hadoop-ozone/integration-test-recon/pom.xml
index b9a75db3bd69..87529373a0ed 100644
--- a/hadoop-ozone/integration-test-recon/pom.xml
+++ b/hadoop-ozone/integration-test-recon/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone Recon Integration Tests</name>
   <description>Apache Ozone Integration Tests with Recon</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/hadoop-ozone/integration-test-s3/pom.xml b/hadoop-ozone/integration-test-s3/pom.xml
index 5d651dec31ff..e479a7c76c6d 100644
--- a/hadoop-ozone/integration-test-s3/pom.xml
+++ b/hadoop-ozone/integration-test-s3/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone S3 Integration Tests</name>
   <description>Apache Ozone Integration Tests with S3 Gateway</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 10e851ba9d43..60dcc9314833 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone Integration Tests</name>
   <description>Apache Ozone Integration Tests</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>ch.qos.reload4j</groupId>
diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml
index acf48a34e531..a2a9b555aa02 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -24,6 +24,11 @@
   <packaging>jar</packaging>
   <name>Apache Ozone Storage Interface</name>
   <description>Apache Ozone Storage Interface</description>
+
+  <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.github.stephenc.jcip</groupId>
diff --git a/hadoop-ozone/mini-cluster/pom.xml b/hadoop-ozone/mini-cluster/pom.xml
index 055ecc8ee8c2..79bfcfa3c4fd 100644
--- a/hadoop-ozone/mini-cluster/pom.xml
+++ b/hadoop-ozone/mini-cluster/pom.xml
@@ -26,6 +26,7 @@
   <description>Apache Ozone Mini Cluster for Integration Tests</description>
 
   <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>
 
diff --git a/hadoop-ozone/multitenancy-ranger/pom.xml b/hadoop-ozone/multitenancy-ranger/pom.xml
index 62f5e5a5fd36..6cfbedefde26 100644
--- a/hadoop-ozone/multitenancy-ranger/pom.xml
+++ b/hadoop-ozone/multitenancy-ranger/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index ba17f1992b37..c9a16940432b 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml
index 58871f098898..39da4fdf0f77 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -22,6 +22,7 @@
   <artifactId>ozone-reconcodegen</artifactId>
   <name>Apache Ozone Recon CodeGen</name>
   <properties>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
   </properties>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 90eb48d0921b..e7fc928ce59c 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -23,6 +23,7 @@
   <name>Apache Ozone Recon</name>
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <pnpm.version>8.15.7</pnpm.version>
   </properties>
   <dependencies>
diff --git a/hadoop-ozone/s3-secret-store/pom.xml b/hadoop-ozone/s3-secret-store/pom.xml
index 28379aeacc78..e95eae7fe879 100644
--- a/hadoop-ozone/s3-secret-store/pom.xml
+++ b/hadoop-ozone/s3-secret-store/pom.xml
@@ -26,6 +26,7 @@
   <properties>
     <downloadSources>true</downloadSources>
     <file.encoding>UTF-8</file.encoding>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index aa510ae6a0f2..6a71afd7b18c 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -27,6 +27,7 @@
     <classpath.skip>false</classpath.skip>
     <downloadSources>true</downloadSources>
     <file.encoding>UTF-8</file.encoding>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index e82de6c6e211..6c8c497b9078 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 454b72aa16f4..c946a00ab42e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,6 +175,7 @@
     <opentelemetry.version>1.58.0</opentelemetry.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
     <ozone.release>Katmai</ozone.release>
+    <ozone.server.java.version>17</ozone.server.java.version>
     <ozone.shaded.native.prefix>org_apache_ozone_shaded</ozone.shaded.native.prefix>
     <ozone.shaded.prefix>org.apache.ozone.shaded</ozone.shaded.prefix>
     <ozone.version>2.2.0-SNAPSHOT</ozone.version>

From 7d488bd1050c4bb656bde9e38a4ab3e39a02ab5b Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Fri, 16 Jan 2026 13:07:26 +0100
Subject: [PATCH 2/7] skip findbugs in CI

---
 .github/workflows/ci.yml                    | 1 -
 hadoop-ozone/dev-support/checks/findbugs.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 06c29d3c657d..802c0cf669ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -161,7 +161,6 @@ jobs:
     uses: ./.github/workflows/check.yml
     with:
       checkout-fetch-depth: ${{ matrix.check != 'bats' && 1 || 0 }}
-      java-version: 8 # HDDS-10150
       needs-maven-cache: ${{ !contains('author,bats', matrix.check) }}
       ratis-args: ${{ inputs.ratis_args }}
       script: ${{ matrix.check }}
diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh b/hadoop-ozone/dev-support/checks/findbugs.sh
index 2286815ef332..f924815ee3d3 100755
--- a/hadoop-ozone/dev-support/checks/findbugs.sh
+++ b/hadoop-ozone/dev-support/checks/findbugs.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#checks:basic
+#checks:skipped
 
 set -u -o pipefail
 

From 05ba75004543a519458ef834564c54c68530a9e0 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 9 Feb 2026 08:59:36 +0100
Subject: [PATCH 3/7] make server java version the default

---
 hadoop-hdds/config/pom.xml                                 | 4 ++++
 hadoop-hdds/container-service/pom.xml                      | 4 ----
 hadoop-hdds/framework/pom.xml                              | 3 ++-
 hadoop-hdds/hadoop-dependency-client/pom.xml               | 4 ++++
 hadoop-hdds/server-scm/pom.xml                             | 1 -
 hadoop-hdds/test-utils/pom.xml                             | 4 ++++
 hadoop-ozone/cli-admin/pom.xml                             | 1 -
 hadoop-ozone/csi/pom.xml                                   | 1 -
 hadoop-ozone/datanode/pom.xml                              | 1 -
 hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml | 4 ----
 hadoop-ozone/freon/pom.xml                                 | 1 -
 hadoop-ozone/httpfsgateway/pom.xml                         | 1 -
 hadoop-ozone/insight/pom.xml                               | 4 +---
 hadoop-ozone/integration-test-recon/pom.xml                | 4 ----
 hadoop-ozone/integration-test-s3/pom.xml                   | 4 ----
 hadoop-ozone/integration-test/pom.xml                      | 4 ----
 hadoop-ozone/interface-storage/pom.xml                     | 5 -----
 hadoop-ozone/mini-cluster/pom.xml                          | 1 -
 hadoop-ozone/multitenancy-ranger/pom.xml                   | 1 -
 hadoop-ozone/ozone-manager/pom.xml                         | 1 -
 hadoop-ozone/ozonefs-common/pom.xml                        | 1 +
 hadoop-ozone/ozonefs-hadoop2/pom.xml                       | 3 +++
 hadoop-ozone/ozonefs-hadoop3/pom.xml                       | 1 +
 hadoop-ozone/ozonefs-shaded/pom.xml                        | 1 +
 hadoop-ozone/recon-codegen/pom.xml                         | 1 -
 hadoop-ozone/recon/pom.xml                                 | 1 -
 hadoop-ozone/s3-secret-store/pom.xml                       | 1 -
 hadoop-ozone/s3gateway/pom.xml                             | 1 -
 hadoop-ozone/tools/pom.xml                                 | 1 -
 pom.xml                                                    | 5 +++--
 30 files changed, 24 insertions(+), 45 deletions(-)

diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml
index dca25492fffa..cdf52e2cb033 100644
--- a/hadoop-hdds/config/pom.xml
+++ b/hadoop-hdds/config/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone HDDS Config</name>
   <description>Apache Ozone Distributed Data Store Config Tools</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/hadoop-hdds/container-service/pom.xml b/hadoop-hdds/container-service/pom.xml
index b8762c25dea8..d43ad4d12028 100644
--- a/hadoop-hdds/container-service/pom.xml
+++ b/hadoop-hdds/container-service/pom.xml
@@ -25,10 +25,6 @@
   <name>Apache Ozone HDDS Container Service</name>
   <description>Apache Ozone Distributed Data Store Container Service</description>
 
-  <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index f0b18cc8077c..8eece2a48143 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -26,7 +26,8 @@
   <description>Apache Ozone Distributed Data Store Server Framework</description>
 
   <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
+    <!-- hdds-server-framework is used by ozone-cli-admin -->
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-hdds/hadoop-dependency-client/pom.xml b/hadoop-hdds/hadoop-dependency-client/pom.xml
index 980d02531ad1..314fd65618af 100644
--- a/hadoop-hdds/hadoop-dependency-client/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-client/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone HDDS Hadoop Client dependencies</name>
   <description>Apache Ozone Distributed Data Store Hadoop client dependencies</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
diff --git a/hadoop-hdds/server-scm/pom.xml b/hadoop-hdds/server-scm/pom.xml
index 92e433f5468c..78c51245feef 100644
--- a/hadoop-hdds/server-scm/pom.xml
+++ b/hadoop-hdds/server-scm/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index 7b59c9196e06..effcb361c3b5 100644
--- a/hadoop-hdds/test-utils/pom.xml
+++ b/hadoop-hdds/test-utils/pom.xml
@@ -25,6 +25,10 @@
   <name>Apache Ozone HDDS Test Utils</name>
   <description>Apache Ozone Distributed Data Store Test Utils</description>
 
+  <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-ozone/cli-admin/pom.xml b/hadoop-ozone/cli-admin/pom.xml
index 656680b8562f..e68105141389 100644
--- a/hadoop-ozone/cli-admin/pom.xml
+++ b/hadoop-ozone/cli-admin/pom.xml
@@ -29,7 +29,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 596ea9104234..ea6f8cbad75f 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <maven.javadoc.skip>true</maven.javadoc.skip>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
diff --git a/hadoop-ozone/datanode/pom.xml b/hadoop-ozone/datanode/pom.xml
index 12299243d039..a91604198157 100644
--- a/hadoop-ozone/datanode/pom.xml
+++ b/hadoop-ozone/datanode/pom.xml
@@ -26,7 +26,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
     <spotbugs.skip>true</spotbugs.skip>
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
index d0252ceaf667..97d3076e889e 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/pom.xml
@@ -25,10 +25,6 @@
   <name>Apache Ozone Mini Ozone Chaos Tests</name>
   <description>Apache Ozone Mini Ozone Chaos Tests</description>
 
-  <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>info.picocli</groupId>
diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml
index ce798653ea71..7e4d7142835a 100644
--- a/hadoop-ozone/freon/pom.xml
+++ b/hadoop-ozone/freon/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/httpfsgateway/pom.xml b/hadoop-ozone/httpfsgateway/pom.xml
index 9ee469d37af9..d4df054b4da4 100644
--- a/hadoop-ozone/httpfsgateway/pom.xml
+++ b/hadoop-ozone/httpfsgateway/pom.xml
@@ -34,7 +34,6 @@
     <httpfs.source.repository>REPO NOT AVAIL</httpfs.source.repository>
     <httpfs.source.revision>REVISION NOT AVAIL</httpfs.source.revision>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index 478037654a98..a52b1d43b68e 100644
--- a/hadoop-ozone/insight/pom.xml
+++ b/hadoop-ozone/insight/pom.xml
@@ -16,9 +16,8 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.ozone</groupId>
-    <artifactId>hdds-hadoop-dependency-client</artifactId>
+    <artifactId>ozone</artifactId>
     <version>2.2.0-SNAPSHOT</version>
-    <relativePath>../../hadoop-hdds/hadoop-dependency-client</relativePath>
   </parent>
   <artifactId>ozone-insight</artifactId>
   <version>2.2.0-SNAPSHOT</version>
@@ -28,7 +27,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/integration-test-recon/pom.xml b/hadoop-ozone/integration-test-recon/pom.xml
index 87529373a0ed..b9a75db3bd69 100644
--- a/hadoop-ozone/integration-test-recon/pom.xml
+++ b/hadoop-ozone/integration-test-recon/pom.xml
@@ -25,10 +25,6 @@
   <name>Apache Ozone Recon Integration Tests</name>
   <description>Apache Ozone Integration Tests with Recon</description>
 
-  <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/hadoop-ozone/integration-test-s3/pom.xml b/hadoop-ozone/integration-test-s3/pom.xml
index e479a7c76c6d..5d651dec31ff 100644
--- a/hadoop-ozone/integration-test-s3/pom.xml
+++ b/hadoop-ozone/integration-test-s3/pom.xml
@@ -25,10 +25,6 @@
   <name>Apache Ozone S3 Integration Tests</name>
   <description>Apache Ozone Integration Tests with S3 Gateway</description>
 
-  <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
diff --git a/hadoop-ozone/integration-test/pom.xml b/hadoop-ozone/integration-test/pom.xml
index 60dcc9314833..10e851ba9d43 100644
--- a/hadoop-ozone/integration-test/pom.xml
+++ b/hadoop-ozone/integration-test/pom.xml
@@ -25,10 +25,6 @@
   <name>Apache Ozone Integration Tests</name>
   <description>Apache Ozone Integration Tests</description>
 
-  <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>ch.qos.reload4j</groupId>
diff --git a/hadoop-ozone/interface-storage/pom.xml b/hadoop-ozone/interface-storage/pom.xml
index a2a9b555aa02..acf48a34e531 100644
--- a/hadoop-ozone/interface-storage/pom.xml
+++ b/hadoop-ozone/interface-storage/pom.xml
@@ -24,11 +24,6 @@
   <packaging>jar</packaging>
   <name>Apache Ozone Storage Interface</name>
   <description>Apache Ozone Storage Interface</description>
-
-  <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.github.stephenc.jcip</groupId>
diff --git a/hadoop-ozone/mini-cluster/pom.xml b/hadoop-ozone/mini-cluster/pom.xml
index 79bfcfa3c4fd..055ecc8ee8c2 100644
--- a/hadoop-ozone/mini-cluster/pom.xml
+++ b/hadoop-ozone/mini-cluster/pom.xml
@@ -26,7 +26,6 @@
   <description>Apache Ozone Mini Cluster for Integration Tests</description>
 
   <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <maven.javadoc.skip>true</maven.javadoc.skip>
   </properties>
 
diff --git a/hadoop-ozone/multitenancy-ranger/pom.xml b/hadoop-ozone/multitenancy-ranger/pom.xml
index 6cfbedefde26..62f5e5a5fd36 100644
--- a/hadoop-ozone/multitenancy-ranger/pom.xml
+++ b/hadoop-ozone/multitenancy-ranger/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/ozone-manager/pom.xml b/hadoop-ozone/ozone-manager/pom.xml
index c9a16940432b..ba17f1992b37 100644
--- a/hadoop-ozone/ozone-manager/pom.xml
+++ b/hadoop-ozone/ozone-manager/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/ozonefs-common/pom.xml b/hadoop-ozone/ozonefs-common/pom.xml
index aecaa66cd4c0..3dadb521b549 100644
--- a/hadoop-ozone/ozonefs-common/pom.xml
+++ b/hadoop-ozone/ozonefs-common/pom.xml
@@ -26,6 +26,7 @@
   <name>Apache Ozone FileSystem Common</name>
   <properties>
     <file.encoding>UTF-8</file.encoding>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/ozonefs-hadoop2/pom.xml b/hadoop-ozone/ozonefs-hadoop2/pom.xml
index fc8a5c6cd8e6..455777597697 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -23,6 +23,9 @@
   <version>2.2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Apache Ozone FS Hadoop 2.x compatibility</name>
+  <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
diff --git a/hadoop-ozone/ozonefs-hadoop3/pom.xml b/hadoop-ozone/ozonefs-hadoop3/pom.xml
index 5a751541481d..c04c99456249 100644
--- a/hadoop-ozone/ozonefs-hadoop3/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop3/pom.xml
@@ -24,6 +24,7 @@
   <packaging>jar</packaging>
   <name>Apache Ozone FS Hadoop 3.x compatibility</name>
   <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
   </properties>
diff --git a/hadoop-ozone/ozonefs-shaded/pom.xml b/hadoop-ozone/ozonefs-shaded/pom.xml
index a3f95f655cfb..d81859e1274c 100644
--- a/hadoop-ozone/ozonefs-shaded/pom.xml
+++ b/hadoop-ozone/ozonefs-shaded/pom.xml
@@ -25,6 +25,7 @@
   <name>Apache Ozone FileSystem Shaded</name>
 
   <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
     <mdep.analyze.skip>true</mdep.analyze.skip>
diff --git a/hadoop-ozone/recon-codegen/pom.xml b/hadoop-ozone/recon-codegen/pom.xml
index 39da4fdf0f77..58871f098898 100644
--- a/hadoop-ozone/recon-codegen/pom.xml
+++ b/hadoop-ozone/recon-codegen/pom.xml
@@ -22,7 +22,6 @@
   <artifactId>ozone-reconcodegen</artifactId>
   <name>Apache Ozone Recon CodeGen</name>
   <properties>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
   </properties>
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 088245e5cdf7..51f01adb65fa 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -23,7 +23,6 @@
   <name>Apache Ozone Recon</name>
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
     <pnpm.version>8.15.7</pnpm.version>
   </properties>
   <dependencies>
diff --git a/hadoop-ozone/s3-secret-store/pom.xml b/hadoop-ozone/s3-secret-store/pom.xml
index e95eae7fe879..28379aeacc78 100644
--- a/hadoop-ozone/s3-secret-store/pom.xml
+++ b/hadoop-ozone/s3-secret-store/pom.xml
@@ -26,7 +26,6 @@
   <properties>
     <downloadSources>true</downloadSources>
     <file.encoding>UTF-8</file.encoding>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/s3gateway/pom.xml b/hadoop-ozone/s3gateway/pom.xml
index 6a71afd7b18c..aa510ae6a0f2 100644
--- a/hadoop-ozone/s3gateway/pom.xml
+++ b/hadoop-ozone/s3gateway/pom.xml
@@ -27,7 +27,6 @@
     <classpath.skip>false</classpath.skip>
     <downloadSources>true</downloadSources>
     <file.encoding>UTF-8</file.encoding>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 6c8c497b9078..e82de6c6e211 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -27,7 +27,6 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
-    <maven.compiler.release>${ozone.server.java.version}</maven.compiler.release>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 52b7a6a0eb6f..d44e3de5bf15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
     <maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
     <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
     <maven.compiler.createMissingPackageInfoClass>false</maven.compiler.createMissingPackageInfoClass>
-    <maven.compiler.release>8</maven.compiler.release>
+    <maven.compiler.release>${ozone.java.version.server}</maven.compiler.release>
     <maven.core.version>3.9.10</maven.core.version>
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <metainf-services.version>1.11</metainf-services.version>
@@ -174,8 +174,9 @@
     <okhttp3.version>4.12.0</okhttp3.version>
     <opentelemetry.version>1.58.0</opentelemetry.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
+    <ozone.java.version.client>8</ozone.java.version.client>
+    <ozone.java.version.server>17</ozone.java.version.server>
     <ozone.release>Katmai</ozone.release>
-    <ozone.server.java.version>17</ozone.server.java.version>
     <ozone.shaded.native.prefix>org_apache_ozone_shaded</ozone.shaded.native.prefix>
     <ozone.shaded.prefix>org.apache.ozone.shaded</ozone.shaded.prefix>
     <ozone.version>2.2.0-SNAPSHOT</ozone.version>

From e8159666e09e240a4da3ee244c4c32c86475a5f2 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 9 Feb 2026 10:07:02 +0100
Subject: [PATCH 4/7] use Java 8 in interface modules

---
 hadoop-hdds/interface-admin/pom.xml   | 1 +
 hadoop-hdds/interface-client/pom.xml  | 1 +
 hadoop-hdds/interface-server/pom.xml  | 1 +
 hadoop-ozone/interface-client/pom.xml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/hadoop-hdds/interface-admin/pom.xml b/hadoop-hdds/interface-admin/pom.xml
index 694ef8e328a8..f3a7a4a8bccf 100644
--- a/hadoop-hdds/interface-admin/pom.xml
+++ b/hadoop-hdds/interface-admin/pom.xml
@@ -26,6 +26,7 @@
   <description>Apache Ozone Distributed Data Store Admin interface</description>
 
   <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
     <!-- no testable code in this module -->
     <maven.test.skip>true</maven.test.skip>
     <!-- only generated code in this module -->
diff --git a/hadoop-hdds/interface-client/pom.xml b/hadoop-hdds/interface-client/pom.xml
index ca9a6aa95bcd..8a6493481896 100644
--- a/hadoop-hdds/interface-client/pom.xml
+++ b/hadoop-hdds/interface-client/pom.xml
@@ -26,6 +26,7 @@
   <description>Apache Ozone Distributed Data Store Client interface</description>
 
   <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
     <!-- no testable code in this module -->
     <maven.test.skip>true</maven.test.skip>
     <!-- only generated code in this module -->
diff --git a/hadoop-hdds/interface-server/pom.xml b/hadoop-hdds/interface-server/pom.xml
index c38927df5007..c20f2e526bf5 100644
--- a/hadoop-hdds/interface-server/pom.xml
+++ b/hadoop-hdds/interface-server/pom.xml
@@ -26,6 +26,7 @@
   <description>Apache Ozone Distributed Data Store Server interface</description>
 
   <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
     <!-- no testable code in this module -->
     <maven.test.skip>true</maven.test.skip>
     <!-- only generated code in this module -->
diff --git a/hadoop-ozone/interface-client/pom.xml b/hadoop-ozone/interface-client/pom.xml
index 60ddefa7cee4..d6a6d0e5198f 100644
--- a/hadoop-ozone/interface-client/pom.xml
+++ b/hadoop-ozone/interface-client/pom.xml
@@ -26,6 +26,7 @@
   <description>Apache Ozone Client interface</description>
 
   <properties>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
     <!-- no tests in this module so far -->
     <maven.test.skip>true</maven.test.skip>
     <!-- only generated code in this module -->

From 4a15ca958ec86cad90bbf8d23b7920e3948d6529 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Tue, 3 Mar 2026 19:23:43 +0100
Subject: [PATCH 5/7] compile ozone-tools for java 8

---
 hadoop-ozone/tools/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 95e9779c7893..74adc9762a25 100644
--- a/hadoop-ozone/tools/pom.xml
+++ b/hadoop-ozone/tools/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
   </properties>
 
   <dependencies>

From cb7126f8f63c5827b7dda207e130def1ff0c511f Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 9 Mar 2026 08:54:40 +0100
Subject: [PATCH 6/7] use Java 8 for ozone-freon

---
 hadoop-ozone/freon/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml
index a4dca0ab8d66..b81c39199869 100644
--- a/hadoop-ozone/freon/pom.xml
+++ b/hadoop-ozone/freon/pom.xml
@@ -27,6 +27,7 @@
 
   <properties>
     <classpath.skip>false</classpath.skip>
+    <maven.compiler.release>${ozone.java.version.client}</maven.compiler.release>
   </properties>
 
   <dependencies>

From 8e91b7c51926fbaa993a6471fe950bd983833283 Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Tue, 10 Mar 2026 07:52:24 +0100
Subject: [PATCH 7/7] update required Java version [skip ci]

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index adcc0b76d2f8..8682a1f9a6df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -40,8 +40,8 @@ If you have any questions, please don't hesitate to contact
 Requirements to compile the code:
 
 * Unix System
-* JDK 1.8 or higher
-* Maven 3.6 or later
+* JDK 17 or later; client modules can be built with JDK 8
+* Maven 3.6.3 or later
 * Internet connection for first build (to fetch all Maven and Ozone dependencies)
 
 (Standard development tools such as make, gcc, etc. are required.)