From 93c7773a957976e1a2f3399e462ac7c9d411a240 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 13 Aug 2025 19:26:58 +0200 Subject: [PATCH 1/2] [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 56bb3225d546d..2d7cf5e423384 100644 --- a/gradle/build.versions.toml +++ b/gradle/build.versions.toml @@ -51,5 +51,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 4775d8a19990e..9b81a384db227 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -469,6 +469,11 @@ + + + + + @@ -946,9 +951,9 @@ - - - + + + @@ -1381,6 +1386,11 @@ + + + + + @@ -2047,6 +2057,11 @@ + + + + + @@ -3050,6 +3065,11 @@ + + + + + @@ -3453,6 +3473,11 @@ + + + + + @@ -3478,11 +3503,21 @@ + + + + + + + + + + @@ -4698,6 +4733,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/**' From 34d689e676a0988773c2093d521df62453d6a63d Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Fri, 15 Aug 2025 13:55:22 +0200 Subject: [PATCH 2/2] Fix verification metadata --- gradle/verification-metadata.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9b81a384db227..3cf844589c961 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1276,6 +1276,11 @@ + + + + +