From ced8dd840f3b2b72aeec2110265e412d45b99f57 Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Wed, 13 May 2026 12:17:09 -0500 Subject: [PATCH 1/5] Require Java 11 at runtime, build on Java 21/25 --- .github/workflows/codeql.yml | 6 +++--- .github/workflows/maven.yml | 41 +++++------------------------------- .github/workflows/python.yml | 4 ++-- README.md | 2 +- pom.xml | 29 +++++-------------------- 5 files changed, 16 insertions(+), 66 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index cf506817f..ad75453fc 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -36,15 +36,15 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 with: category: "/language:${{matrix.language}}" diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index f90ea70ca..5a7d9e5ec 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,47 +13,16 @@ jobs: contents: read strategy: matrix: - java: [8, 11, 17, 21] + java: [21, 25] os: [ubuntu-latest, windows-latest, macos-latest] python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] - exclude: - - java: 8 - python-version: '3.9' - - java: 8 - python-version: '3.10' - - java: 8 - python-version: '3.11' - - java: 8 - python-version: '3.12' - - java: 8 - python-version: '3.13' - - java: 17 - python-version: '3.9' - - java: 17 - python-version: '3.10' - - java: 17 - python-version: '3.11' - - java: 17 - python-version: '3.12' - - java: 17 - python-version: '3.13' - - java: 21 - python-version: '3.9' - - java: 21 - python-version: '3.10' - - java: 21 - python-version: '3.11' - - java: 21 - python-version: '3.12' - - java: 21 - python-version: '3.13' runs-on: ${{ matrix.os }} env: maven_commands: install steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -61,7 +30,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ matrix.java }} distribution: 'zulu' @@ -75,7 +44,7 @@ jobs: if: startsWith(github.ref, 'refs/tags') runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Create a GitHub release run: gh release create --generate-notes "${GITHUB_REF#refs/tags/}" env: diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 37aa9e91f..a2c267524 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -12,7 +12,7 @@ jobs: ruff: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: astral-sh/ruff-action@v3 + - uses: actions/checkout@v6 + - uses: astral-sh/ruff-action@v4 - name: Lint with Ruff run: ruff check --output-format=github diff --git a/README.md b/README.md index 860377317..4ac2a112b 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ following before submitting a pull request: * verify that the branch merges cleanly into ```master``` * verify that the branch compiles using Maven - * verify that the branch does not use syntax or API specific to Java 1.8+ + * verify that the branch does not use syntax or API specific to Java > 11 * internal developers only: [run the data tests](https://bio-formats.readthedocs.io/en/stable/developers/commit-testing.html) against directories corresponding to the affected format(s) diff --git a/pom.xml b/pom.xml index 90d967b48..a70511b92 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,7 @@ 2.0.9 6.1.1 ${ome_common.version} + 7.9.0 2016-06 specification/src/main/resources/released-schema/${ome.model.schemaver} @@ -138,11 +139,9 @@ org.apache.maven.plugins maven-compiler-plugin 3.14.0 - + - 8 - 8 - 8 + 11 @@ -240,11 +239,11 @@ maven-javadoc-plugin - 3.0.1 + 3.12.0 false - http://docs.oracle.com/javase/7/docs/api/ + https://docs.oracle.com/en/java/javase/11/docs/api/ @@ -377,23 +376,5 @@ - - jdk8-only - - (,11) - - - 7.5 - - - - jdk11+ - - [11,) - - - 7.9.0 - - From 692c858579bc14f10de613a3dd32fc4a2438cbac Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Wed, 13 May 2026 12:20:18 -0500 Subject: [PATCH 2/5] Revert change to ruff action Apparently https://github.com/astral-sh/ruff-action/releases/tag/v4.0.0 is not available yet. --- .github/workflows/python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index a2c267524..60fe197a8 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -13,6 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v6 - - uses: astral-sh/ruff-action@v4 + - uses: astral-sh/ruff-action@v3 - name: Lint with Ruff run: ruff check --output-format=github From 201f4e2eca6975e804258468705bf7935221cbdb Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Tue, 19 May 2026 20:08:50 -0500 Subject: [PATCH 3/5] Continue to build on Java 11/17 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5a7d9e5ec..0ad58862c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -13,7 +13,7 @@ jobs: contents: read strategy: matrix: - java: [21, 25] + java: [11, 17, 21, 25] os: [ubuntu-latest, windows-latest, macos-latest] python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] runs-on: ${{ matrix.os }} From 1c544cd59ddb7eb9db29ae866bc2ea0b0184344b Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Wed, 20 May 2026 09:51:27 -0500 Subject: [PATCH 4/5] Reduce Java/Python version matrix --- .github/workflows/maven.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0ad58862c..4683a67b4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,7 +15,26 @@ jobs: matrix: java: [11, 17, 21, 25] os: [ubuntu-latest, windows-latest, macos-latest] - python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] + python-version: ['3.10', '3.11', '3.12', '3.13'] + exclude: + - java: 11 + python: 3.11 + - java: 11 + python: 3.12 + - java: 11 + python: 3.13 + - java: 17 + python: 3.10 + - java: 17 + python: 3.12 + - java: 17 + python: 3.13 + - java: 25 + python: 3.10 + - java: 25 + python: 3.11 + - java: 25 + python: 3.12 runs-on: ${{ matrix.os }} env: maven_commands: install From 299fe8b4eb5d296787eae95e2f2f3b1b04e3bc2c Mon Sep 17 00:00:00 2001 From: Melissa Linkert Date: Wed, 20 May 2026 09:56:35 -0500 Subject: [PATCH 5/5] Fix version key names --- .github/workflows/maven.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4683a67b4..94a30ca3c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -18,23 +18,23 @@ jobs: python-version: ['3.10', '3.11', '3.12', '3.13'] exclude: - java: 11 - python: 3.11 + python-version: 3.11 - java: 11 - python: 3.12 + python-version: 3.12 - java: 11 - python: 3.13 + python-version: 3.13 - java: 17 - python: 3.10 + python-version: 3.10 - java: 17 - python: 3.12 + python-version: 3.12 - java: 17 - python: 3.13 + python-version: 3.13 - java: 25 - python: 3.10 + python-version: 3.10 - java: 25 - python: 3.11 + python-version: 3.11 - java: 25 - python: 3.12 + python-version: 3.12 runs-on: ${{ matrix.os }} env: maven_commands: install