Skip to content

Commit ea56a88

Browse files
committed
Update version of Java used during release to match what is installed on tern.
1 parent 6569ef7 commit ea56a88

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,8 @@ allprojects { currentProj ->
397397
// Add standard javac options
398398
tasks.withType(JavaCompile) { compilationTask ->
399399
dependsOn(':installGitHooks')
400+
// Use JDK 21 because that is what used in the release. If you update this line, also update,
401+
// JAVA_HOME in docs/developer/release/release_vars.py.
400402
boolean jdk21Compiler = project.getProperties().getOrDefault('useJdk21Compiler', false)
401403
if (jdk21Compiler) {
402404
// This uses the Java 21 compiler to compile all code.

docs/developer/release/release_vars.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ def execute(command_args, halt_if_fail=True, capture_output=False, working_dir=N
154154
os.environ["TEXINPUTS"] = ".:/homes/gws/mernst/tex/sty:/homes/gws/mernst/tex:..:"
155155
os.environ["PERLLIB"] = getAndAppend("PERLLIB", ":") + perl_libs
156156
os.environ["PERL5LIB"] = getAndAppend("PERL5LIB", ":") + perl_libs
157-
os.environ["JAVA_17_HOME"] = "/usr/lib/jvm/java-17-openjdk/"
158-
os.environ["JAVA_HOME"] = os.environ["JAVA_17_HOME"]
157+
os.environ["JAVA_21_HOME"] = "/usr/lib/jvm/java-21-openjdk/"
158+
os.environ["JAVA_HOME"] = os.environ["JAVA_21_HOME"]
159159

160160
EDITOR = os.getenv("EDITOR")
161161
if EDITOR is None:

0 commit comments

Comments
 (0)