From 6de15f9245f44cf154d4243444b3304d21767bd4 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Sat, 31 Jan 2026 19:45:19 +0800 Subject: [PATCH 1/2] Allow to run ds-memory 3.0 on Java 25 --- .../org/apache/datasketches/memory/internal/ResourceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java index d899c0c5..531337e9 100644 --- a/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java +++ b/datasketches-memory-java8/src/main/java/org/apache/datasketches/memory/internal/ResourceImpl.java @@ -151,9 +151,9 @@ public static void checkBounds(final long reqOff, final long reqLen, final long * @param p1 The second number group */ static void checkJavaVersion(final String jdkVer, final int p0, final int p1 ) { - final boolean ok = ((p0 == 1) && (p1 == 8)) || (p0 == 8) || (p0 == 11) || (p0 == 17 || (p0 == 21)); + final boolean ok = ((p0 == 1) && (p1 == 8)) || (p0 == 8) || (p0 == 11) || (p0 == 17) || (p0 == 21) || (p0 == 25); if (!ok) { throw new IllegalArgumentException( - "Unsupported JDK Major Version. It must be one of 1.8, 8, 11, 17, 21: " + jdkVer); + "Unsupported JDK Major Version. It must be one of 1.8, 8, 11, 17, 21, 25: " + jdkVer); } } From 1ed302a4f178f329ce8d5bb919565b46a3cd7050 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Sat, 31 Jan 2026 20:16:58 +0800 Subject: [PATCH 2/2] Bump actions to latest versions --- .github/workflows/auto-jdk-matrix.yml | 6 +++--- .github/workflows/javadoc.yml | 2 +- .github/workflows/manual-coverage.yml | 6 +++--- .github/workflows/manual-os-matrix.yml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-jdk-matrix.yml b/.github/workflows/auto-jdk-matrix.yml index 70a847c3..8d0ff117 100644 --- a/.github/workflows/auto-jdk-matrix.yml +++ b/.github/workflows/auto-jdk-matrix.yml @@ -19,19 +19,19 @@ jobs: steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v4 with: persist-credentials: false - name: Cache local Maven repository - uses: actions/cache@v3.2.3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: build-${{ runner.os }}-maven- - name: Install Matrix JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: | 8 diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml index aeff17bf..0273a21c 100644 --- a/.github/workflows/javadoc.yml +++ b/.github/workflows/javadoc.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Generate JavaDoc run: mvn javadoc:javadoc - name: Deploy JavaDoc diff --git a/.github/workflows/manual-coverage.yml b/.github/workflows/manual-coverage.yml index 03320e59..2d167189 100644 --- a/.github/workflows/manual-coverage.yml +++ b/.github/workflows/manual-coverage.yml @@ -31,19 +31,19 @@ jobs: steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: build-${{ runner.os }}-maven- - name: Install Matrix JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.jdk }} distribution: 'temurin' diff --git a/.github/workflows/manual-os-matrix.yml b/.github/workflows/manual-os-matrix.yml index 9e2d36f6..64674443 100644 --- a/.github/workflows/manual-os-matrix.yml +++ b/.github/workflows/manual-os-matrix.yml @@ -34,19 +34,19 @@ jobs: steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false - name: Cache local Maven repository - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2/repository key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: build-${{ runner.os }}-maven- - name: Install Matrix JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.jdk }} distribution: 'temurin'