From 8f665d7c5cd97377d46e59ee6e61b6808f5276bc Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 12 Oct 2026 12:13:02 +0200 Subject: [PATCH] ci: build on JDK 25 while keeping the Java 11 bytecode target Switch the build, CodeQL and Maven Central release workflows to JDK 25. The compiler plugin keeps 11, so the published artifact stays usable on Java 11. --- .github/workflows/codeql.yml | 2 +- .github/workflows/push.yml | 3 ++- CLAUDE.md | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index dcd1da3..372e4b0 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,4 +17,4 @@ jobs: name: Code Scan uses: entur/gha-security/.github/workflows/code-scan.yml@v2 with: - java_version: "11" + java_version: "25" diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e4e5071..c1b0320 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -27,7 +27,7 @@ jobs: wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings.xml -O .github/workflows/settings.xml - uses: actions/setup-java@v4 with: - java-version: 11 + java-version: 25 distribution: liberica - name: Cache Maven dependencies uses: actions/cache@v4 @@ -52,5 +52,6 @@ jobs: uses: entur/gha-maven-central/.github/workflows/maven-publish.yml@v1 secrets: inherit with: + java_version: 25 push_to_repo: true snapshot: false \ No newline at end of file diff --git a/CLAUDE.md b/CLAUDE.md index 31c18fe..75ec8a6 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -53,7 +53,7 @@ Generated sources land in `target/generated-sources`. JAXB binding customization ### Key Design Decisions - **Jakarta EE**: Uses `jakarta.xml.bind` (3.0+), not legacy `javax.xml.bind`. -- **Java 11** target (source and bytecode). +- **Java 11** target (source and bytecode) via `` in the compiler plugin; CI builds on JDK 25, and any JDK from 11 to 25 works locally. - **JUnit 4** for tests. - **JSON support exists only for SIRI 2.1** (`SiriJson`), not 2.0. - **SIRI 2.0 utility lives in legacy package** `org.rutebanken.siri20.util` (historical).