Skip to content

Commit 93c7773

Browse files
committed
[Gradle] Update nebula ospackage plugin to 12.1.0 (elastic#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
1 parent 8d57832 commit 93c7773

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
@@ -51,5 +51,5 @@ wiremock = "com.github.tomakehurst:wiremock-jre8-standalone:2.23.2"
5151
xmlunit-core = "org.xmlunit:xmlunit-core:2.8.2"
5252

5353
[plugins]
54-
ospackage = { id = "com.netflix.nebula.ospackage-base", version = "11.11.2" }
54+
ospackage = { id = "com.netflix.nebula.ospackage-base", version = "12.1.0" }
5555
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
@@ -469,6 +469,11 @@
469469
<sha256 value="084197555590a53bb21b59508a3330559f536ddb448eafd1ec675f5462036fcf" origin="Generated by Gradle"/>
470470
</artifact>
471471
</component>
472+
<component group="com.github.luben" name="zstd-jni" version="1.5.6-3">
473+
<artifact name="zstd-jni-1.5.6-3.jar">
474+
<sha256 value="f72ede1b39258faf81277dc58de30c71cbae4253732558d2ce10b53d8b5763d5" origin="Generated by Gradle"/>
475+
</artifact>
476+
</component>
472477
<component group="com.github.spotbugs" name="spotbugs-annotations" version="4.0.2">
473478
<artifact name="spotbugs-annotations-4.0.2.jar">
474479
<sha256 value="3ef6c9f822b601aa151e10e123b49e5604243a4a99bcc47e4e1f9eea9781dc63" origin="Generated by Gradle"/>
@@ -946,9 +951,9 @@
946951
<sha256 value="d694edd7bae3bc1a8e0dae2f5a22c479ff04d6b9bfcb0ab751a42f02e02d2100" origin="Generated by Gradle"/>
947952
</artifact>
948953
</component>
949-
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="11.11.2">
950-
<artifact name="gradle-ospackage-plugin-11.11.2.jar">
951-
<sha256 value="2cad0d0af05514e07b163d30d71c486ef1a205265ecc4821f8fb9a121f2cabe5" origin="Generated by Gradle"/>
954+
<component group="com.netflix.nebula" name="gradle-ospackage-plugin" version="12.1.0">
955+
<artifact name="gradle-ospackage-plugin-12.1.0.jar">
956+
<sha256 value="825fbb7f3f52083eaae9bec50cee88da2a43462715b2e23afa27972ce803d092" origin="Generated by Gradle"/>
952957
</artifact>
953958
</component>
954959
<component group="com.netflix.nebula" name="nebula-gradle-interop" version="2.0.0">
@@ -1381,6 +1386,11 @@
13811386
<sha256 value="b0a5159e926de8084ff066025142270443533656bc599b8bb31d14d11fd138a4" origin="Generated by Gradle"/>
13821387
</artifact>
13831388
</component>
1389+
<component group="io.airlift" name="aircompressor" version="0.27">
1390+
<artifact name="aircompressor-0.27.jar">
1391+
<sha256 value="fdbef3137a28f63bb0cb93487803080ede746a4ec3d421e36c6f0c305c35e5e4" origin="Generated by Gradle"/>
1392+
</artifact>
1393+
</component>
13841394
<component group="io.dropwizard.metrics" name="metrics-core" version="3.2.4">
13851395
<artifact name="metrics-core-3.2.4.jar">
13861396
<sha256 value="a083e3f3bdf4173d7065cdd4521964394a840d586bf8653676203d18354a6d2c" origin="Generated by Gradle"/>
@@ -2047,6 +2057,11 @@
20472057
<sha256 value="27bb5d40f37c3bb7205b4a0540247df057715e9f6cbbd97d626ab8b50318bb04" origin="Generated by Gradle"/>
20482058
</artifact>
20492059
</component>
2060+
<component group="org.apache.commons" name="commons-compress" version="1.26.2">
2061+
<artifact name="commons-compress-1.26.2.jar">
2062+
<sha256 value="9168a03141d8fc7eda21a2360d83cc0412bcbb1d6204d992bd48c2573cb3c6b8" origin="Generated by Gradle"/>
2063+
</artifact>
2064+
</component>
20502065
<component group="org.apache.commons" name="commons-compress" version="1.27.1">
20512066
<artifact name="commons-compress-1.27.1.jar">
20522067
<sha256 value="293d80f54b536b74095dcd7ea3cf0a29bbfc3402519281332495f4420d370d16" origin="Generated by Gradle"/>
@@ -3050,6 +3065,11 @@
30503065
<sha256 value="d0674469f8e6fbc866dbc5c955463d7629b7755ac7c87a235b9469d8257d6b8c" origin="Generated by Gradle"/>
30513066
</artifact>
30523067
</component>
3068+
<component group="org.apache.maven" name="maven-archiver" version="3.6.3">
3069+
<artifact name="maven-archiver-3.6.3.jar">
3070+
<sha256 value="83566129898c7a384bffaa118a76a40667d546948460b43eeb8563fa17635848" origin="Generated by Gradle"/>
3071+
</artifact>
3072+
</component>
30533073
<component group="org.apache.maven" name="maven-artifact" version="3.6.1">
30543074
<artifact name="maven-artifact-3.6.1.jar">
30553075
<sha256 value="797fa1bcf54d7216e863b8177c04507d09c708eec153626eca473054c0eb56f3" origin="Generated by Gradle"/>
@@ -3453,6 +3473,11 @@
34533473
<sha256 value="92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53" origin="Generated by Gradle"/>
34543474
</artifact>
34553475
</component>
3476+
<component group="org.codehaus.plexus" name="plexus-archiver" version="4.10.0">
3477+
<artifact name="plexus-archiver-4.10.0.jar">
3478+
<sha256 value="4c07814ff4a39199999ae82bba1e38aa4f25637467fcac6a66ed63a76535799a" origin="Generated by Gradle"/>
3479+
</artifact>
3480+
</component>
34563481
<component group="org.codehaus.plexus" name="plexus-archiver" version="4.2.3">
34573482
<artifact name="plexus-archiver-4.2.3.jar">
34583483
<sha256 value="fff8157bfb3d6f1f099c7da7de3e14bfd061ad4ab29599afa7bbf0271368d748" origin="Generated by Gradle"/>
@@ -3478,11 +3503,21 @@
34783503
<sha256 value="b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662" origin="Generated by Gradle"/>
34793504
</artifact>
34803505
</component>
3506+
<component group="org.codehaus.plexus" name="plexus-interpolation" version="1.27">
3507+
<artifact name="plexus-interpolation-1.27.jar">
3508+
<sha256 value="3fb4fb6143fdf964024c3cb738551524b9ea84e5c211cd660c559ad0703e5230" origin="Generated by Gradle"/>
3509+
</artifact>
3510+
</component>
34813511
<component group="org.codehaus.plexus" name="plexus-io" version="3.2.0">
34823512
<artifact name="plexus-io-3.2.0.jar">
34833513
<sha256 value="15cf8cbd9e014b7156482bbb48e515613158bdd9b4b908d21e6b900f7876f6ff" origin="Generated by Gradle"/>
34843514
</artifact>
34853515
</component>
3516+
<component group="org.codehaus.plexus" name="plexus-io" version="3.5.0">
3517+
<artifact name="plexus-io-3.5.0.jar">
3518+
<sha256 value="965ed28912cf1ae4c628112c4009e0c19819bc44ed5db8af54ee5eda21036a3e" origin="Generated by Gradle"/>
3519+
</artifact>
3520+
</component>
34863521
<component group="org.codehaus.plexus" name="plexus-utils" version="3.2.0">
34873522
<artifact name="plexus-utils-3.2.0.jar">
34883523
<sha256 value="0b91029df4c216b8824bd95361f52e260e86ccf93a2619fd88c8f15d23dcb30d" origin="Generated by Gradle"/>
@@ -4698,6 +4733,11 @@
46984733
<sha256 value="254cbb052f718f36ee2a75ae95bd2e0251b0513fc76d038b6dbbcf0942fcc11f" origin="Generated by Gradle"/>
46994734
</artifact>
47004735
</component>
4736+
<component group="org.vafer" name="jdeb" version="1.14">
4737+
<artifact name="jdeb-1.14.jar">
4738+
<sha256 value="2b999a40b769f6cca3fb381b8f1118fc344b88abe2f38ba1b2d53257f89f3602" origin="Generated by Gradle"/>
4739+
</artifact>
4740+
</component>
47014741
<component group="org.vafer" name="jdeb" version="1.8">
47024742
<artifact name="jdeb-1.8.jar">
47034743
<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
@@ -46,6 +46,14 @@ esplugin.bundleSpec.from {
4646
configurations.nativeBundle.files.collect { zipTree(it) }
4747
}
4848

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

0 commit comments

Comments
 (0)