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 bca0bad7b18 HDDS-15279. populate-cache should use Java 21 (#10274)
bca0bad7b18 is described below
commit bca0bad7b18a3a786b409f450d0f58bf14548a00
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat May 16 16:34:38 2026 +0200
HDDS-15279. populate-cache should use Java 21 (#10274)
---
.github/workflows/ci.yml | 3 ++-
.github/workflows/populate-cache.yml | 13 +++++++++++--
hadoop-ozone/dist/pom.xml | 7 +++++++
pom.xml | 21 ++++++++++++++-------
4 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7ac92359ac3..68348c9e5f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,9 +38,10 @@ on:
required: false
env:
+ # BUILD_ARGS and TEST_JAVA_VERSION are duplicated in populate-cache.yml,
please keep in sync
BUILD_ARGS: "-Pdist -Psrc -Dmaven.javadoc.skip=true -Drocks_tools_native"
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 and MAVEN_OPTS are duplicated in check.yml and
populate-cache.yml, please keep in sync
MAVEN_ARGS: --batch-mode --settings ${{ github.workspace
}}/dev-support/ci/maven-settings.xml
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
OZONE_WITH_COVERAGE: ${{ github.event_name == 'push' }}
diff --git a/.github/workflows/populate-cache.yml
b/.github/workflows/populate-cache.yml
index 3f88233cdbd..1081311b1fa 100644
--- a/.github/workflows/populate-cache.yml
+++ b/.github/workflows/populate-cache.yml
@@ -22,6 +22,8 @@ on:
branches:
- master
- ozone-1.4
+ - ozone-2.0
+ - ozone-2.1
paths:
- 'pom.xml'
- '**/pom.xml'
@@ -31,6 +33,13 @@ on:
permissions: { }
+env:
+ # variables are duplicated from ci.yml, please keep in sync
+ BUILD_ARGS: "-Pdist -Psrc -Dmaven.javadoc.skip=true -Drocks_tools_native"
+ TEST_JAVA_VERSION: 21 # JDK version used by CI build and tests; should match
the JDK version in apache/ozone-runner image
+ MAVEN_ARGS: --batch-mode --settings ${{ github.workspace
}}/dev-support/ci/maven-settings.xml
+ MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.http.retryHandler.class=standard
-Dmaven.wagon.http.retryHandler.count=3
+
jobs:
build:
runs-on: ubuntu-24.04
@@ -54,7 +63,7 @@ jobs:
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 #
v5.2.0
with:
distribution: 'temurin'
- java-version: 8
+ java-version: ${{ env.TEST_JAVA_VERSION }}
- name: Get NodeJS version
id: nodejs-version
@@ -77,7 +86,7 @@ jobs:
- name: Fetch dependencies
if: steps.restore-cache.outputs.cache-hit != 'true'
- run: mvn --batch-mode --no-transfer-progress --show-version
-Pgo-offline -Pdist -Drocks_tools_native clean verify
+ run: mvn $BUILD_ARGS $MAVEN_ARGS --no-transfer-progress --show-version
-Pgo-offline clean verify
- name: Delete Ozone jars from repo
if: steps.restore-cache.outputs.cache-hit != 'true'
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 13d0e082380..1545a5c1645 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -43,6 +43,13 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.cli</artifactId>
+ <version>${jacoco.version}</version>
+ <classifier>nodeps</classifier>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
diff --git a/pom.xml b/pom.xml
index 4dfb8d7e1ca..02e4bfa145b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2201,13 +2201,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>${pmd.version}</version>
- <configuration>
- <rulesets>
- <ruleset>dev-support/pmd/pmd-ruleset.xml</ruleset>
- </rulesets>
- <printFailingErrors>true</printFailingErrors>
- <includeTests>true</includeTests>
- </configuration>
</plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
@@ -2407,6 +2400,17 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <rulesets>
+ <ruleset>dev-support/pmd/pmd-ruleset.xml</ruleset>
+ </rulesets>
+ <printFailingErrors>true</printFailingErrors>
+ <includeTests>true</includeTests>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
@@ -2666,6 +2670,9 @@
<profile>
<id>go-offline</id>
<properties>
+ <cyclonedx.skip>true</cyclonedx.skip>
+ <enforcer.skip>true</enforcer.skip>
+ <jacoco.skip>true</jacoco.skip>
<maven.javadoc.skip>true</maven.javadoc.skip>
<mdep.analyze.skip>true</mdep.analyze.skip>
<skip.installnodepnpm>true</skip.installnodepnpm>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
