From 63102b2f5c2f2597549e3fbaa2506045cdbecc44 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
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 bf0e6873f9073..01a64982a1f60 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 0f614eb05e1d6..24b2bedc5eb7c 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -471,6 +471,11 @@
             <sha256 value="084197555590a53bb21b59508a3330559f536ddb448eafd1ec675f5462036fcf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.luben" name="zstd-jni" version="1.5.6-3">
+         <artifact name="zstd-jni-1.5.6-3.jar">
+            <sha256 value="f72ede1b39258faf81277dc58de30c71cbae4253732558d2ce10b53d8b5763d5" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.spotbugs" name="spotbugs-annotations" version="4.0.2">
          <artifact name="spotbugs-annotations-4.0.2.jar">
             <sha256 value="3ef6c9f822b601aa151e10e123b49e5604243a4a99bcc47e4e1f9eea9781dc63" origin="Generated by Gradle"/>
@@ -998,9 +1003,9 @@
             <sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.11.2">
-         <artifact name="gradle-ospackage-plugin-11.11.2.jar">
-            <sha256 value="2cad0d0af05514e07b163d30d71c486ef1a205265ecc4821f8fb9a121f2cabe5" origin="Generated by Gradle"/>
+      <component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="12.1.0">
+         <artifact name="gradle-ospackage-plugin-12.1.0.jar">
+            <sha256 value="825fbb7f3f52083eaae9bec50cee88da2a43462715b2e23afa27972ce803d092" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.netflix.nebula" name="nebula-gradle-interop" version="2.0.0">
@@ -1453,6 +1458,11 @@
             <sha256 value="b0a5159e926de8084ff066025142270443533656bc599b8bb31d14d11fd138a4" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.airlift" name="aircompressor" version="0.27">
+         <artifact name="aircompressor-0.27.jar">
+            <sha256 value="fdbef3137a28f63bb0cb93487803080ede746a4ec3d421e36c6f0c305c35e5e4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.dropwizard.metrics" name="metrics-core" version="3.2.4">
          <artifact name="metrics-core-3.2.4.jar">
             <sha256 value="a083e3f3bdf4173d7065cdd4521964394a840d586bf8653676203d18354a6d2c" origin="Generated by Gradle"/>
@@ -2125,6 +2135,11 @@
             <sha256 value="27bb5d40f37c3bb7205b4a0540247df057715e9f6cbbd97d626ab8b50318bb04" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-compress" version="1.26.2">
+         <artifact name="commons-compress-1.26.2.jar">
+            <sha256 value="9168a03141d8fc7eda21a2360d83cc0412bcbb1d6204d992bd48c2573cb3c6b8" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-compress" version="1.27.1">
          <artifact name="commons-compress-1.27.1.jar">
             <sha256 value="293d80f54b536b74095dcd7ea3cf0a29bbfc3402519281332495f4420d370d16" origin="Generated by Gradle"/>
@@ -3138,6 +3153,11 @@
             <sha256 value="d0674469f8e6fbc866dbc5c955463d7629b7755ac7c87a235b9469d8257d6b8c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.maven" name="maven-archiver" version="3.6.3">
+         <artifact name="maven-archiver-3.6.3.jar">
+            <sha256 value="83566129898c7a384bffaa118a76a40667d546948460b43eeb8563fa17635848" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.apache.maven" name="maven-artifact" version="3.6.1">
          <artifact name="maven-artifact-3.6.1.jar">
             <sha256 value="797fa1bcf54d7216e863b8177c04507d09c708eec153626eca473054c0eb56f3" origin="Generated by Gradle"/>
@@ -3546,6 +3566,11 @@
             <sha256 value="92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.plexus" name="plexus-archiver" version="4.10.0">
+         <artifact name="plexus-archiver-4.10.0.jar">
+            <sha256 value="4c07814ff4a39199999ae82bba1e38aa4f25637467fcac6a66ed63a76535799a" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.plexus" name="plexus-archiver" version="4.2.3">
          <artifact name="plexus-archiver-4.2.3.jar">
             <sha256 value="fff8157bfb3d6f1f099c7da7de3e14bfd061ad4ab29599afa7bbf0271368d748" origin="Generated by Gradle"/>
@@ -3571,11 +3596,21 @@
             <sha256 value="b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.plexus" name="plexus-interpolation" version="1.27">
+         <artifact name="plexus-interpolation-1.27.jar">
+            <sha256 value="3fb4fb6143fdf964024c3cb738551524b9ea84e5c211cd660c559ad0703e5230" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.plexus" name="plexus-io" version="3.2.0">
          <artifact name="plexus-io-3.2.0.jar">
             <sha256 value="15cf8cbd9e014b7156482bbb48e515613158bdd9b4b908d21e6b900f7876f6ff" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.plexus" name="plexus-io" version="3.5.0">
+         <artifact name="plexus-io-3.5.0.jar">
+            <sha256 value="965ed28912cf1ae4c628112c4009e0c19819bc44ed5db8af54ee5eda21036a3e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.plexus" name="plexus-utils" version="3.2.0">
          <artifact name="plexus-utils-3.2.0.jar">
             <sha256 value="0b91029df4c216b8824bd95361f52e260e86ccf93a2619fd88c8f15d23dcb30d" origin="Generated by Gradle"/>
@@ -4806,6 +4841,11 @@
             <sha256 value="254cbb052f718f36ee2a75ae95bd2e0251b0513fc76d038b6dbbcf0942fcc11f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.vafer" name="jdeb" version="1.14">
+         <artifact name="jdeb-1.14.jar">
+            <sha256 value="2b999a40b769f6cca3fb381b8f1118fc344b88abe2f38ba1b2d53257f89f3602" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.vafer" name="jdeb" version="1.8">
          <artifact name="jdeb-1.8.jar">
             <sha256 value="374fe02a09314da6ec8219e005598e760323a1abe4b715cc33ce3e2a9bcda932" origin="Generated by Gradle"/>
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/**'