Skip to content

Commit e5951ef

Browse files
authored
[Gradle] Update nebula ospackage plugin to 12.1.0 (#132640) (#132865)
* [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
1 parent 1321fd2 commit e5951ef

File tree

3 files changed

+52
-4
lines changed

3 files changed

+52
-4
lines changed

gradle/build.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
5050
xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"
5151

5252
[plugins]
53-
ospackage = { id = "com.netflix.nebula.ospackage-base", version = "11.11.2" }
53+
ospackage = { id = "com.netflix.nebula.ospackage-base", version = "12.1.0" }
5454
nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref="nmcp" }

gradle/verification-metadata.xml

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,11 @@
479479
<sha256 value="084197555590a53bb21b59508a3330559f536ddb448eafd1ec675f5462036fcf" origin="Generated by Gradle"/>
480480
</artifact>
481481
</component>
482+
<component group="com.github.luben" name="zstd-jni" version="1.5.6-3">
483+
<artifact name="zstd-jni-1.5.6-3.jar">
484+
<sha256 value="f72ede1b39258faf81277dc58de30c71cbae4253732558d2ce10b53d8b5763d5" origin="Generated by Gradle"/>
485+
</artifact>
486+
</component>
482487
<component group="com.github.spotbugs" name="spotbugs-annotations" version="4.0.2">
483488
<artifact name="spotbugs-annotations-4.0.2.jar">
484489
<sha256 value="3ef6c9f822b601aa151e10e123b49e5604243a4a99bcc47e4e1f9eea9781dc63" origin="Generated by Gradle"/>
@@ -956,9 +961,9 @@
956961
<sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
957962
</artifact>
958963
</component>
959-
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.11.2">
960-
<artifact name="gradle-ospackage-plugin-11.11.2.jar">
961-
<sha256 value="2cad0d0af05514e07b163d30d71c486ef1a205265ecc4821f8fb9a121f2cabe5" origin="Generated by Gradle"/>
964+
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="12.1.0">
965+
<artifact name="gradle-ospackage-plugin-12.1.0.jar">
966+
<sha256 value="825fbb7f3f52083eaae9bec50cee88da2a43462715b2e23afa27972ce803d092" origin="Generated by Gradle"/>
962967
</artifact>
963968
</component>
964969
<component group="com.netflix.nebula" name="nebula-gradle-interop" version="2.0.0">
@@ -1391,6 +1396,11 @@
13911396
<sha256 value="b0a5159e926de8084ff066025142270443533656bc599b8bb31d14d11fd138a4" origin="Generated by Gradle"/>
13921397
</artifact>
13931398
</component>
1399+
<component group="io.airlift" name="aircompressor" version="0.27">
1400+
<artifact name="aircompressor-0.27.jar">
1401+
<sha256 value="fdbef3137a28f63bb0cb93487803080ede746a4ec3d421e36c6f0c305c35e5e4" origin="Generated by Gradle"/>
1402+
</artifact>
1403+
</component>
13941404
<component group="io.dropwizard.metrics" name="metrics-core" version="3.2.4">
13951405
<artifact name="metrics-core-3.2.4.jar">
13961406
<sha256 value="a083e3f3bdf4173d7065cdd4521964394a840d586bf8653676203d18354a6d2c" origin="Generated by Gradle"/>
@@ -2033,6 +2043,11 @@
20332043
<sha256 value="27bb5d40f37c3bb7205b4a0540247df057715e9f6cbbd97d626ab8b50318bb04" origin="Generated by Gradle"/>
20342044
</artifact>
20352045
</component>
2046+
<component group="org.apache.commons" name="commons-compress" version="1.26.2">
2047+
<artifact name="commons-compress-1.26.2.jar">
2048+
<sha256 value="9168a03141d8fc7eda21a2360d83cc0412bcbb1d6204d992bd48c2573cb3c6b8" origin="Generated by Gradle"/>
2049+
</artifact>
2050+
</component>
20362051
<component group="org.apache.commons" name="commons-compress" version="1.27.1">
20372052
<artifact name="commons-compress-1.27.1.jar">
20382053
<sha256 value="293d80f54b536b74095dcd7ea3cf0a29bbfc3402519281332495f4420d370d16" origin="Generated by Gradle"/>
@@ -3096,6 +3111,11 @@
30963111
<sha256 value="d0674469f8e6fbc866dbc5c955463d7629b7755ac7c87a235b9469d8257d6b8c" origin="Generated by Gradle"/>
30973112
</artifact>
30983113
</component>
3114+
<component group="org.apache.maven" name="maven-archiver" version="3.6.3">
3115+
<artifact name="maven-archiver-3.6.3.jar">
3116+
<sha256 value="83566129898c7a384bffaa118a76a40667d546948460b43eeb8563fa17635848" origin="Generated by Gradle"/>
3117+
</artifact>
3118+
</component>
30993119
<component group="org.apache.maven" name="maven-artifact" version="3.6.1">
31003120
<artifact name="maven-artifact-3.6.1.jar">
31013121
<sha256 value="797fa1bcf54d7216e863b8177c04507d09c708eec153626eca473054c0eb56f3" origin="Generated by Gradle"/>
@@ -3499,6 +3519,11 @@
34993519
<sha256 value="92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53" origin="Generated by Gradle"/>
35003520
</artifact>
35013521
</component>
3522+
<component group="org.codehaus.plexus" name="plexus-archiver" version="4.10.0">
3523+
<artifact name="plexus-archiver-4.10.0.jar">
3524+
<sha256 value="4c07814ff4a39199999ae82bba1e38aa4f25637467fcac6a66ed63a76535799a" origin="Generated by Gradle"/>
3525+
</artifact>
3526+
</component>
35023527
<component group="org.codehaus.plexus" name="plexus-archiver" version="4.2.3">
35033528
<artifact name="plexus-archiver-4.2.3.jar">
35043529
<sha256 value="fff8157bfb3d6f1f099c7da7de3e14bfd061ad4ab29599afa7bbf0271368d748" origin="Generated by Gradle"/>
@@ -3524,11 +3549,21 @@
35243549
<sha256 value="b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662" origin="Generated by Gradle"/>
35253550
</artifact>
35263551
</component>
3552+
<component group="org.codehaus.plexus" name="plexus-interpolation" version="1.27">
3553+
<artifact name="plexus-interpolation-1.27.jar">
3554+
<sha256 value="3fb4fb6143fdf964024c3cb738551524b9ea84e5c211cd660c559ad0703e5230" origin="Generated by Gradle"/>
3555+
</artifact>
3556+
</component>
35273557
<component group="org.codehaus.plexus" name="plexus-io" version="3.2.0">
35283558
<artifact name="plexus-io-3.2.0.jar">
35293559
<sha256 value="15cf8cbd9e014b7156482bbb48e515613158bdd9b4b908d21e6b900f7876f6ff" origin="Generated by Gradle"/>
35303560
</artifact>
35313561
</component>
3562+
<component group="org.codehaus.plexus" name="plexus-io" version="3.5.0">
3563+
<artifact name="plexus-io-3.5.0.jar">
3564+
<sha256 value="965ed28912cf1ae4c628112c4009e0c19819bc44ed5db8af54ee5eda21036a3e" origin="Generated by Gradle"/>
3565+
</artifact>
3566+
</component>
35323567
<component group="org.codehaus.plexus" name="plexus-utils" version="3.2.0">
35333568
<artifact name="plexus-utils-3.2.0.jar">
35343569
<sha256 value="0b91029df4c216b8824bd95361f52e260e86ccf93a2619fd88c8f15d23dcb30d" origin="Generated by Gradle"/>
@@ -4704,6 +4739,11 @@
47044739
<sha256 value="254cbb052f718f36ee2a75ae95bd2e0251b0513fc76d038b6dbbcf0942fcc11f" origin="Generated by Gradle"/>
47054740
</artifact>
47064741
</component>
4742+
<component group="org.vafer" name="jdeb" version="1.14">
4743+
<artifact name="jdeb-1.14.jar">
4744+
<sha256 value="2b999a40b769f6cca3fb381b8f1118fc344b88abe2f38ba1b2d53257f89f3602" origin="Generated by Gradle"/>
4745+
</artifact>
4746+
</component>
47074747
<component group="org.vafer" name="jdeb" version="1.8">
47084748
<artifact name="jdeb-1.8.jar">
47094749
<sha256 value="374fe02a09314da6ec8219e005598e760323a1abe4b715cc33ce3e2a9bcda932" origin="Generated by Gradle"/>

x-pack/plugin/ml/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ esplugin.bundleSpec.from {
5151
configurations.nativeBundle.files.collect { zipTree(it) }
5252
}
5353

54+
// this is required due to https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/472
55+
// those lib files should not be executable in the first place
56+
esplugin.bundleSpec.filesMatching("platform/**/lib/*") { details ->
57+
details.permissions {
58+
unix(0644)
59+
}
60+
}
61+
5462
// We don't ship the individual nativeBundle licenses - instead
5563
// they get combined into the top level NOTICES file we ship
5664
esplugin.bundleSpec.exclude 'platform/licenses/**'

0 commit comments

Comments
 (0)