From 0e1329cd7e1b2ab982b611e83052ded160df2411 Mon Sep 17 00:00:00 2001 From: Manuel Naranjo Date: Fri, 22 Mar 2024 18:07:11 +0100 Subject: [PATCH] coursier: don't pass -noverify for java 13+ In Java 13 -noverify got marked as deprecated and may be dropped in the future --- coursier.bzl | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/coursier.bzl b/coursier.bzl index 4919939fa..ae9bbdb4d 100644 --- a/coursier.bzl +++ b/coursier.bzl @@ -791,6 +791,16 @@ def make_coursier_dep_tree( "--" + ":".join([e["group"], e["artifact"]])) + # extract java_version + java_path = _java_path(repository_ctx) + java_version = 0 + if java_path: + exec_result = _execute(repository_ctx, [java_path, "-version"]) + if (exec_result.return_code != 0): + fail("Error while running java -version: " + exec_result.stderr) + + java_version = parse_java_version(exec_result.stdout + exec_result.stderr) + cmd = _generate_java_jar_command(repository_ctx, repository_ctx.path("coursier")) cmd.extend(["fetch"]) @@ -858,7 +868,13 @@ def make_coursier_dep_tree( exec_result = _execute(repository_ctx, [java_path, "-version"]) if (exec_result.return_code != 0): fail("Error while running java -version: " + exec_result.stderr) - if parse_java_version(exec_result.stdout + exec_result.stderr) > 8: + + java_version = parse_java_version(exec_result.stdout + exec_result.stderr) + if java_version > 13: + if "-noverify" in cmd: + cmd.remove("-noverify") + + if java_version > 8: java_cmd = cmd[0] java_args = cmd[1:]