From 4fa42d41eeb1210798f3df8fda811829afe5ac6f Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 13 Aug 2025 19:26:58 +0200 Subject: [PATCH] [Gradle] Update nebula ospackage plugin to 12.1.0 (#132640) * [Gradle] Update nebula ospackage plugin to 12.1.0 - 12.1.0 is required by Gradle 9.x these days and required before we can update to the newest Gradle version * Fix issue with file permissions in deb and rpm archives * Cleanup dependency metadata --- gradle/build.versions.toml | 2 +- gradle/verification-metadata.xml | 46 +++++++++++++++++++++++++++++--- x-pack/plugin/ml/build.gradle | 8 ++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/gradle/build.versions.toml b/gradle/build.versions.toml index 2a96feb9e3bd0..6fcad72762714 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -50,5 +50,5 @@ wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2" xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2" [plugins] -ospackage = { id = "com.netflix.nebula.ospackage-base", version = "11.11.2" } +ospackage = { id = "com.netflix.nebula.ospackage-base", version = "12.1.0" } nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref="nmcp" } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index cf36a1294d8b5..f8e29d69a4033 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -474,6 +474,11 @@ + + + + + @@ -951,9 +956,9 @@ - - - + + + @@ -1396,6 +1401,11 @@ + + + + + @@ -2038,6 +2048,11 @@ + + + + + @@ -3051,6 +3066,11 @@ + + + + + @@ -3454,6 +3474,11 @@ + + + + + @@ -3479,11 +3504,21 @@ + + + + + + + + + + @@ -4679,6 +4714,11 @@ + + + + + diff --git a/x-pack/plugin/ml/build.gradle b/x-pack/plugin/ml/build.gradle index ada71e33f7c8e..feb58613ceb22 100644 --- a/x-pack/plugin/ml/build.gradle +++ b/x-pack/plugin/ml/build.gradle @@ -46,6 +46,14 @@ esplugin.bundleSpec.from { configurations.nativeBundle.files.collect { zipTree(it) } } +// this is required due to https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/472 +// those lib files should not be executable in the first place +esplugin.bundleSpec.filesMatching("platform/**/lib/*") { details -> + details.permissions { + unix(0644) + } +} + // We don't ship the individual nativeBundle licenses - instead // they get combined into the top level NOTICES file we ship esplugin.bundleSpec.exclude 'platform/licenses/**'