Skip to content

Commit 8205d4e

Browse files
rjernstalexey-ivanov-es
authored andcommitted
Fix entitlement tools to build (elastic#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.
1 parent 2c9c33e commit 8205d4e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

libs/core/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
apply plugin: 'elasticsearch.publish'
11-
apply plugin: 'elasticsearch.mrjar'
1211

1312
dependencies {
1413
// This dependency is used only by :libs:core for null-checking interop with other tools

libs/entitlement/tools/common/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
plugins {
11-
id 'java'
12-
}
13-
14-
group = 'org.elasticsearch.entitlement.tools'
10+
apply plugin: 'elasticsearch.build'
1511

12+
tasks.named('forbiddenApisMain').configure {
13+
replaceSignatureFiles 'jdk-signatures'
14+
}

0 commit comments

Comments
 (0)