From e47b3752c62987f19cc74c57231f4b7101552137 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Sat, 28 Feb 2026 09:28:41 +0000 Subject: [PATCH 1/2] Java build from make uses --release 9 (was just for "make release" before). This means that branches/PRs using Java >9 will get picked up with GitHub CI. --- prism/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/prism/Makefile b/prism/Makefile index eb352c5e5..caca457fb 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -367,6 +367,7 @@ endif # Java flags JFLAGS += -proc:none # Remove annotation processing warnings due to log4j +JFLAGS += --release 9 # Enforce Java language level export CFLAGS CXXFLAGS LDFLAGS JFLAGS LIBPREFIX LIBSUFFIX @@ -674,10 +675,7 @@ BIN_DIST_INST = $(BIN_DIST_DIR)-installer.exe # Build a (binary) distribution in the release directory -release: release_config clean_all all binary release_check_version build_release clean_binary - -release_config: - $(eval JFLAGS := --release 9 $(JFLAGS)) +release: clean_all all binary release_check_version build_release clean_binary release_check_version: @if [ "$(VERSION)" = "" ]; then echo "Usage: make release VERSION=4.5"; exit 1; fi From 0a64d47d0d0494c40476fd8eb39bf407ba90e9bc Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Sat, 28 Feb 2026 11:11:20 +0000 Subject: [PATCH 2/2] Update Java language level from 9 to 11. Will be useful for some upcoming branch merges. JARs in lib folder are untouched for now and still built for Java 9. --- prism/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prism/Makefile b/prism/Makefile index caca457fb..a6473a728 100644 --- a/prism/Makefile +++ b/prism/Makefile @@ -367,7 +367,7 @@ endif # Java flags JFLAGS += -proc:none # Remove annotation processing warnings due to log4j -JFLAGS += --release 9 # Enforce Java language level +JFLAGS += --release 11 # Enforce Java language level export CFLAGS CXXFLAGS LDFLAGS JFLAGS LIBPREFIX LIBSUFFIX