This is an automated email from the ASF dual-hosted git repository. leerho pushed a commit to branch update_main_for_java25 in repository https://gitbox.apache.org/repos/asf/datasketches-memory.git
commit c2f82651880d149c6ffb830024d75e03440914fb Author: Lee Rhodes <[email protected]> AuthorDate: Wed Jun 10 12:58:18 2026 -0700 Update main for java 25, step 1 --- .github/workflows/auto-jdk-os-matrix.yml | 14 ++++++++++---- .github/workflows/stageReleaseSources.yml | 13 +++++++------ .../apache/datasketches/memory/internal/ResourceImpl.java | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.github/workflows/auto-jdk-os-matrix.yml b/.github/workflows/auto-jdk-os-matrix.yml index 3c6ae9f5..2f286f0a 100644 --- a/.github/workflows/auto-jdk-os-matrix.yml +++ b/.github/workflows/auto-jdk-os-matrix.yml @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - jdk: [ '11', '17', '21' ] + jdk: [ '11', '17', '21', '25' ] os: [ windows-latest, ubuntu-latest, macos-latest ] include: - os: windows-latest @@ -63,7 +63,7 @@ jobs: arch: x64 - os: macos-latest arch: aarch64 - + - jdk: '11' distribution: 'temurin' jvm_args: >- @@ -71,19 +71,25 @@ jobs: --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED - + - jdk: '17' distribution: 'temurin' jvm_args: >- --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/jdk.internal.ref=ALL-UNNAMED - + - jdk: '21' distribution: 'temurin' jvm_args: >- --add-exports java.base/jdk.internal.misc=ALL-UNNAMED --add-exports java.base/jdk.internal.ref=ALL-UNNAMED + - jdk: '25' + distribution: 'temurin' + jvm_args: >- + --add-exports java.base/jdk.internal.misc=ALL-UNNAMED + --add-exports java.base/jdk.internal.ref=ALL-UNNAMED + # Reference your reusable workflow branch uses: apache/datasketches-memory/.github/workflows/reusable-jdk-os-matrix.yml@workflows with: diff --git a/.github/workflows/stageReleaseSources.yml b/.github/workflows/stageReleaseSources.yml index 9a4ff0e6..17b49cc3 100644 --- a/.github/workflows/stageReleaseSources.yml +++ b/.github/workflows/stageReleaseSources.yml @@ -81,14 +81,14 @@ jobs: # Define standard names based on the extracted POM version SRC_ZIP="datasketches-memory-${{ env.POM_VERSION }}-src.zip" - + echo "Locating generated assembly asset..." cp target/datasketches-memory-${{ env.POM_VERSION }}-source-release.zip staging_dir/$SRC_ZIP - + cd staging_dir echo "Generating SHA-512 checksum signature file..." sha512sum $SRC_ZIP > $SRC_ZIP.sha512 - + echo "Verification Checksum Content:" cat $SRC_ZIP.sha512 @@ -103,11 +103,11 @@ jobs: test-source-candidate: name: Test Source Candidate on ${{ matrix.os }} needs: assemble-source-candidate - runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] + runs-on: ${{ matrix.os }} steps: # 1. Download the zipped artifact uploaded by the previous job @@ -125,7 +125,7 @@ jobs: ZIP_FILE=$(ls downloaded-bundle/*.zip) echo "Unzipping $ZIP_FILE..." unzip -q $ZIP_FILE -d test-workspace - + # 3. Setup Java Toolchain (11, 17, and 21) - name: Setup Java Toolchains uses: actions/setup-java@v5 @@ -134,8 +134,9 @@ jobs: 11 17 21 + 25 distribution: 'temurin' - + # 4. Run the tests on the unzipped sources - name: Execute Tests shell: bash diff --git a/datasketches-memory-java17_21/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java b/datasketches-memory-java17_21/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java index 9a1fe309..85907d81 100644 --- a/datasketches-memory-java17_21/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java +++ b/datasketches-memory-java17_21/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java @@ -144,7 +144,7 @@ public abstract class ResourceImpl implements Resource { * @param javaMajor the first number from the <i>System.getProperty("java.version")</i> string." */ static void checkJavaVersion(final int javaMajor) { - final boolean ok = ( (javaMajor == 17) || (javaMajor == 21) ); + final boolean ok = ( (javaMajor == 17) || (javaMajor >= 21) ); if (!ok) { throw new IllegalArgumentException("This Java version is not supported: " + javaMajor); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
