From 129e17455121838a508b5dba6d6273ba0a57e017 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 22 Nov 2024 13:24:50 -0800 Subject: [PATCH] Fix entitlement tools to build (#117351) This commit adjusts the common lib of entitlement tools to use elasticsearch.build so that it gets java version configuration automatically. Additionally the mrjar plugin is removed from the core lib since it is not used there. --- libs/core/build.gradle | 1 - libs/entitlement/tools/common/build.gradle | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/core/build.gradle b/libs/core/build.gradle index e24417e09a53..99c22620e735 100644 --- a/libs/core/build.gradle +++ b/libs/core/build.gradle @@ -8,7 +8,6 @@ */ apply plugin: 'elasticsearch.publish' -apply plugin: 'elasticsearch.mrjar' dependencies { // This dependency is used only by :libs:core for null-checking interop with other tools diff --git a/libs/entitlement/tools/common/build.gradle b/libs/entitlement/tools/common/build.gradle index 3373a8f74743..89772b4132c5 100644 --- a/libs/entitlement/tools/common/build.gradle +++ b/libs/entitlement/tools/common/build.gradle @@ -7,9 +7,8 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -plugins { - id 'java' +apply plugin: 'elasticsearch.build' + +tasks.named('forbiddenApisMain').configure { + replaceSignatureFiles 'jdk-signatures' } - -group = 'org.elasticsearch.entitlement.tools' -