This is an automated email from the ASF dual-hosted git repository.
erose 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 faf6926cd06 HDDS-13670. Replace javac.version with
maven.compiler.release (#9693)
faf6926cd06 is described below
commit faf6926cd06aaac8095eede02819d7d79a3eb81c
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Feb 4 19:58:48 2026 +0100
HDDS-13670. Replace javac.version with maven.compiler.release (#9693)
---
.github/workflows/ci.yml | 3 +--
pom.xml | 7 +------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 83e8338ff73..71af2b9824e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,6 @@ on:
required: false
env:
BUILD_ARGS: "-Pdist -Psrc -Dmaven.javadoc.skip=true -Drocks_tools_native"
- # Minimum required Java version for running Ozone is defined in pom.xml
(javac.version).
TEST_JAVA_VERSION: 21 # JDK version used by CI build and tests; should match
the JDK version in apache/ozone-runner image
# MAVEN_ARGS and MAVEN_OPTS are duplicated in check.yml, please keep in sync
MAVEN_ARGS: --batch-mode --settings ${{ github.workspace
}}/dev-support/ci/maven-settings.xml
@@ -147,7 +146,7 @@ jobs:
ratis-args: ${{ inputs.ratis_args }}
runner: ${{ matrix.os }}
script: compile
- script-args: "-Pdist -DskipRecon -Dmaven.javadoc.failOnWarnings=${{
matrix.java != 8 }} -Djavac.version=${{ matrix.java }}"
+ script-args: "-Pdist -DskipRecon -Dmaven.javadoc.failOnWarnings=${{
matrix.java != 8 }} -Dmaven.compiler.release=${{ matrix.java }}"
sha: ${{ needs.build-info.outputs.sha }}
split: ${{ matrix.java }}
timeout-minutes: 45
diff --git a/pom.xml b/pom.xml
index f0f1880d5cf..92c9bc34a49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,6 @@
<distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
<download-maven-plugin.version>1.9.0</download-maven-plugin.version>
<dropwizard-metrics.version>3.2.6</dropwizard-metrics.version>
- <enforced.java.version>[${javac.version},)</enforced.java.version>
<enforced.maven.version>[3.6.3,)</enforced.maven.version>
<errorprone-annotations.version>2.29.2</errorprone-annotations.version>
<!-- test groups excluded by default (without any manual profile
activation) -->
@@ -112,7 +111,6 @@
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
<java.dev.jna.version>5.2.0</java.dev.jna.version>
<java.security.egd>file:///dev/urandom</java.security.egd>
- <javac.version>8</javac.version>
<javassist.version>3.30.2-GA</javassist.version>
<javax.inject.version>1</javax.inject.version>
<jaxb-api.version>2.3.3</jaxb-api.version>
@@ -164,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>${javac.version}</maven.compiler.release>
+ <maven.compiler.release>8</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>
@@ -1807,9 +1805,6 @@
<requireMavenVersion>
<version>${enforced.maven.version}</version>
</requireMavenVersion>
- <requireJavaVersion>
- <version>${enforced.java.version}</version>
- </requireJavaVersion>
</rules>
</configuration>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
