This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 1908e5e2928 HDDS-14439. Require Java 17 for server components (#9640)
1908e5e2928 is described below
commit 1908e5e292897fbbccc4ddd5243909a97821b269
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sun Aug 30 18:42:43 2026 +0200
HDDS-14439. Require Java 17 for server components (#9640)
---
.github/workflows/ci.yml | 6 +++---
.github/workflows/populate-cache.yml | 11 -----------
CONTRIBUTING.md | 4 ++--
hadoop-hdds/config/pom.xml | 4 ++++
hadoop-hdds/framework/pom.xml | 2 ++
hadoop-hdds/hadoop-dependency-client/pom.xml | 4 ++++
hadoop-hdds/interface-admin/pom.xml | 1 +
hadoop-hdds/interface-client/pom.xml | 1 +
hadoop-hdds/interface-server/pom.xml | 1 +
hadoop-hdds/test-utils/pom.xml | 4 ++++
hadoop-ozone/dev-support/checks/findbugs.sh | 2 +-
hadoop-ozone/dist/pom.xml | 18 +++++-------------
hadoop-ozone/freon/pom.xml | 1 +
hadoop-ozone/insight/pom.xml | 3 +--
hadoop-ozone/interface-client/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/pom.xml | 10 +---------
hadoop-ozone/tools/pom.xml | 1 +
pom.xml | 4 +++-
22 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55c2647d32c..4b94df39566 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -173,7 +173,7 @@ jobs:
if: needs.build-info.outputs.needs-compile == 'true'
strategy:
matrix:
- java: [ 8, 17, 25 ]
+ java: [ 17, 25 ]
include:
- os: ubuntu-24.04
- java: 21
@@ -186,7 +186,7 @@ jobs:
ratis-args: ${{ inputs.ratis_args }}
runner: ${{ matrix.os }}
script: compile
- script-args: "-Pdist -DskipRecon -Dmaven.javadoc.failOnWarnings=${{
matrix.java != 8 }} -Dmaven.compiler.release=${{ matrix.java }}"
+ script-args: "-Pdist -DskipRecon -Dmaven.javadoc.failOnWarnings
-Dmaven.compiler.release=${{ matrix.java }}"
sha: ${{ needs.build-info.outputs.sha }}
split: ${{ matrix.java }}
timeout-minutes: 45
@@ -201,7 +201,7 @@ jobs:
uses: ./.github/workflows/check.yml
with:
checkout-fetch-depth: ${{ matrix.check != 'bats' && 1 || 0 }}
- java-version: ${{ matrix.check == 'findbugs' && '8' ||
needs.build-info.outputs.java-version }} # HDDS-10150
+ java-version: ${{ needs.build-info.outputs.java-version }}
needs-maven-cache: ${{ !contains('author,bats', matrix.check) }}
ratis-args: ${{ inputs.ratis_args }}
script: ${{ matrix.check }}
diff --git a/.github/workflows/populate-cache.yml
b/.github/workflows/populate-cache.yml
index f0675576334..24b17c5f8ea 100644
--- a/.github/workflows/populate-cache.yml
+++ b/.github/workflows/populate-cache.yml
@@ -88,17 +88,6 @@ jobs:
if: steps.restore-cache.outputs.cache-hit != 'true'
run: mvn $BUILD_ARGS $MAVEN_ARGS --no-transfer-progress --show-version
-Pgo-offline clean verify
- - name: Setup Java 8
- if: steps.restore-cache.outputs.cache-hit != 'true'
- uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 #
v5.7.0
- with:
- distribution: 'temurin'
- java-version: 8
-
- - name: Fetch dependencies for Java 8
- if: steps.restore-cache.outputs.cache-hit != 'true'
- run: mvn $MAVEN_ARGS --no-transfer-progress --show-version
-Pgo-offline -DskipRecon -DskipShade test-compile
-
- name: Delete Ozone jars from repo
if: steps.restore-cache.outputs.cache-hit != 'true'
run: rm -fr ~/.m2/repository/org/apache/ozone
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d705ccc8850..8434542915d 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.)
diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml
index 8ded8e16553..1d1ea3560e7 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.apache.hadoop</groupId>
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 29aae79681a..8526af0d8ae 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -27,6 +27,8 @@
<properties>
<classpath.skip>false</classpath.skip>
+ <!-- hdds-server-framework is used by ozone-tools -->
+
<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 ff88aa42939..38746e49d9a 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/interface-admin/pom.xml
b/hadoop-hdds/interface-admin/pom.xml
index c8af75e4d3c..0f2adece807 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 1c27ac5a348..62e77a6fff4 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 da5165e3ca4..cae5f01b9d3 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-hdds/test-utils/pom.xml b/hadoop-hdds/test-utils/pom.xml
index f4ac1fe73d3..4042647ea10 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>ch.qos.reload4j</groupId>
diff --git a/hadoop-ozone/dev-support/checks/findbugs.sh
b/hadoop-ozone/dev-support/checks/findbugs.sh
index 2286815ef33..f7643846811 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 HDDS-10150
set -u -o pipefail
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index d399b1f9cbc..4e4e1df7f0e 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -117,6 +117,11 @@
<artifactId>ozone-httpfsgateway</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.ozone</groupId>
+ <artifactId>ozone-iceberg</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-insight</artifactId>
@@ -269,19 +274,6 @@
</plugins>
</build>
<profiles>
- <profile>
- <id>jdk11-with-iceberg</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.ozone</groupId>
- <artifactId>ozone-iceberg</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>build-with-ozonefs</id>
<activation>
diff --git a/hadoop-ozone/freon/pom.xml b/hadoop-ozone/freon/pom.xml
index 9637ec3200d..aed70f18d5f 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>
diff --git a/hadoop-ozone/insight/pom.xml b/hadoop-ozone/insight/pom.xml
index cc68cb5fe7a..88a46f29b4c 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.3.0-SNAPSHOT</version>
- <relativePath>../../hadoop-hdds/hadoop-dependency-client</relativePath>
</parent>
<artifactId>ozone-insight</artifactId>
<version>2.3.0-SNAPSHOT</version>
diff --git a/hadoop-ozone/interface-client/pom.xml
b/hadoop-ozone/interface-client/pom.xml
index db5b5d4731f..7772c41f9aa 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 -->
diff --git a/hadoop-ozone/ozonefs-common/pom.xml
b/hadoop-ozone/ozonefs-common/pom.xml
index d7d0bb3b1d3..fe87bf574e8 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 87b9c2a7285..701a34d33ef 100644
--- a/hadoop-ozone/ozonefs-hadoop2/pom.xml
+++ b/hadoop-ozone/ozonefs-hadoop2/pom.xml
@@ -23,6 +23,9 @@
<version>2.3.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 8569d49fd94..1087c74838b 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 6c8a3b17d84..ab3c4c6af8b 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/pom.xml b/hadoop-ozone/pom.xml
index 9d0b7ec7110..4ae5359a7d8 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -37,6 +37,7 @@
<module>fault-injection-test</module>
<module>freon</module>
<module>httpfsgateway</module>
+ <module>iceberg</module>
<module>insight</module>
<module>integration-test</module>
<module>integration-test-recon</module>
@@ -106,15 +107,6 @@
</build>
<profiles>
- <profile>
- <id>jdk11-with-iceberg</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <modules>
- <module>iceberg</module>
- </modules>
- </profile>
<profile>
<id>build-with-ozonefs</id>
<activation>
diff --git a/hadoop-ozone/tools/pom.xml b/hadoop-ozone/tools/pom.xml
index 9e26438e94f..8855e408414 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>
diff --git a/pom.xml b/pom.xml
index ca8d181548a..b6249c17e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-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.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<metainf-services.version>1.11</metainf-services.version>
<mockito.version>4.11.0</mockito.version>
@@ -163,6 +163,8 @@
<okhttp3.version>4.12.0</okhttp3.version>
<opentelemetry.version>1.65.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>Kenai Fjords</ozone.release>
<ozone.shaded.native.prefix>org_apache_ozone_shaded</ozone.shaded.native.prefix>
<ozone.shaded.prefix>org.apache.ozone.shaded</ozone.shaded.prefix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
