Skip to content

Commit 194e572

Browse files
committed
fixup! Address code review comments
1 parent d4de546 commit 194e572

File tree

5 files changed

+17
-54
lines changed

5 files changed

+17
-54
lines changed

gradle/verification-metadata.xml

Lines changed: 8 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -984,43 +984,21 @@
984984
<sha256 value="e8c1c594e2425bdbea2d860de55c69b69fc5d59454452449a0f0913c2a5b8a31" origin="Generated by Gradle"/>
985985
</artifact>
986986
</component>
987+
<component group="com.nimbusds" name="nimbus-jose-jwt" version="10.0.1">
988+
<artifact name="nimbus-jose-jwt-10.0.1.jar">
989+
<sha256 value="f28dbd9ab128324f05050d76b78469d3a9cd83e0319aabc68d1c276e3923e13a" origin="Generated by Gradle"/>
990+
</artifact>
991+
</component>
987992
<component group="com.nimbusds" name="nimbus-jose-jwt" version="4.41.1">
988993
<artifact name="nimbus-jose-jwt-4.41.1.jar">
989994
<sha256 value="fbfd0d5f2b2f86758b821daa5e79b5d7c965edd9dc1b2cc80b515df1c6ddc22d" origin="Generated by Gradle"/>
990995
</artifact>
991996
</component>
992-
<component group="com.nimbusds" name="nimbus-jose-jwt" version="9.37.3">
993-
<artifact name="nimbus-jose-jwt-9.37.3.jar">
994-
<sha256 value="12ae4a3a260095d7aeba2adea7ae396e8b9570db8b7b409e09a824c219cc0444" origin="Generated by Gradle">
995-
<also-trust value="afc63b689d881439b95f343b1dca750391edac63b87392be4d90d19c94ccafbe"/>
996-
</sha256>
997-
</artifact>
998-
</component>
999-
<component group="com.nimbusds" name="nimbus-jose-jwt" version="9.8.1">
1000-
<artifact name="nimbus-jose-jwt-9.8.1.jar">
1001-
<sha256 value="7664cf8c6f2adadf600287812b32878277beda54912eab9d4c2932cd50cb704a" origin="Generated by Gradle"/>
1002-
</artifact>
1003-
</component>
1004-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.10.1">
1005-
<artifact name="oauth2-oidc-sdk-11.10.1.jar">
1006-
<sha256 value="9e51b2c17503cdd3eb97f41491c712aff7783bb3c67185d789f44ccf2a603b26" origin="Generated by Gradle"/>
1007-
</artifact>
1008-
</component>
1009997
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.22.2">
1010998
<artifact name="oauth2-oidc-sdk-11.22.2.jar">
1011999
<sha256 value="64fab42f17bf8e0efb193dd34da716ef7abb7515234036119df1776b808dc066" origin="Generated by Gradle"/>
10121000
</artifact>
10131001
</component>
1014-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="11.9.1">
1015-
<artifact name="oauth2-oidc-sdk-11.9.1.jar">
1016-
<sha256 value="0820c9690966304d075347b88e81ae490213440fc4d2c84f3d370d41941b2b9c" origin="Generated by Gradle"/>
1017-
</artifact>
1018-
</component>
1019-
<component group="com.nimbusds" name="oauth2-oidc-sdk" version="9.37">
1020-
<artifact name="oauth2-oidc-sdk-9.37.jar">
1021-
<sha256 value="44a04bbed5ae3f6d198aa73ee6b545c476e528ec1a267ef3e9f7033f886dd6fe" origin="Generated by Gradle"/>
1022-
</artifact>
1023-
</component>
10241002
<component group="com.perforce" name="p4java" version="2015.2.1365273">
10251003
<artifact name="p4java-2015.2.1365273.jar">
10261004
<sha256 value="fbcf286c5863a658b400ec2595ee13c5d49c656f735923088509e3f976ea421e" origin="Generated by Gradle"/>
@@ -1784,36 +1762,21 @@
17841762
<sha256 value="0972bbc99437c4163acd09b630e6c77eab4cfab8a9594621c95466c0c6645396" origin="Generated by Gradle"/>
17851763
</artifact>
17861764
</component>
1787-
<component group="net.minidev" name="accessors-smart" version="2.5.0">
1788-
<artifact name="accessors-smart-2.5.0.jar">
1789-
<sha256 value="12314fc6881d66a413fd66370787adba16e504fbf7e138690b0f3952e3fbd321" origin="Generated by Gradle"/>
1765+
<component group="net.minidev" name="accessors-smart" version="2.5.2">
1766+
<artifact name="accessors-smart-2.5.2.jar">
1767+
<sha256 value="9b8a7bc43861d6156c021166d941fb7dddbe4463e2fa5ee88077e4b01452a836" origin="Generated by Gradle"/>
17901768
</artifact>
17911769
</component>
17921770
<component group="net.minidev" name="json-smart" version="2.3">
17931771
<artifact name="json-smart-2.3.jar">
17941772
<sha256 value="903f48c8aa4c3f6426440b8d32de89fa1dc23b1169abde25e4e1d068aa67708b" origin="Generated by Gradle"/>
17951773
</artifact>
17961774
</component>
1797-
<component group="net.minidev" name="json-smart" version="2.4.10">
1798-
<artifact name="json-smart-2.4.10.jar">
1799-
<sha256 value="70cab5e9488630dc631b1fc6e7fa550d95cddd19ba14db39ceca7cabfbd4e5ae" origin="Generated by Gradle"/>
1800-
</artifact>
1801-
</component>
18021775
<component group="net.minidev" name="json-smart" version="2.4.2">
18031776
<artifact name="json-smart-2.4.2.jar">
18041777
<sha256 value="64072f56d9dff5040b2acec477c5d5e6bcebfc88c508f12acb26072d07942146" origin="Generated by Gradle"/>
18051778
</artifact>
18061779
</component>
1807-
<component group="net.minidev" name="json-smart" version="2.5.0">
1808-
<artifact name="json-smart-2.5.0.jar">
1809-
<sha256 value="432b9e545848c4141b80717b26e367f83bf33f19250a228ce75da6e967da2bc7" origin="Generated by Gradle"/>
1810-
</artifact>
1811-
</component>
1812-
<component group="net.minidev" name="json-smart" version="2.5.1">
1813-
<artifact name="json-smart-2.5.1.jar">
1814-
<sha256 value="86c0c189581b79b57b0719f443a724e9f628ffbb9eef645cf79194f5973a1001" origin="Generated by Gradle"/>
1815-
</artifact>
1816-
</component>
18171780
<component group="net.minidev" name="json-smart" version="2.5.2">
18181781
<artifact name="json-smart-2.5.2.jar">
18191782
<sha256 value="4fbdedb0105cedc7f766b95c297d2e88fb6a560da48f3bbaa0cc538ea8b7bf71" origin="Generated by Gradle"/>

modules/repository-azure/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ dependencies {
6363
api "com.github.stephenc.jcip:jcip-annotations:1.0-1"
6464
api "com.nimbusds:content-type:2.3"
6565
api "com.nimbusds:lang-tag:1.7"
66-
api("com.nimbusds:nimbus-jose-jwt:9.37.3"){
66+
api("com.nimbusds:nimbus-jose-jwt:10.0.1"){
6767
exclude group: 'com.google.crypto.tink', module: 'tink' // it's an optional dependency on which we don't rely
6868
}
6969
api("com.nimbusds:oauth2-oidc-sdk:11.22.2"){
@@ -73,10 +73,10 @@ dependencies {
7373
api "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3"
7474
api "net.java.dev.jna:jna-platform:${versions.jna}" // Maven says 5.14.0 but this aligns with the Elasticsearch-wide version
7575
api "net.java.dev.jna:jna:${versions.jna}" // Maven says 5.14.0 but this aligns with the Elasticsearch-wide version
76-
api "net.minidev:accessors-smart:2.5.0"
76+
api "net.minidev:accessors-smart:2.5.2"
7777
api "net.minidev:json-smart:2.5.2"
7878
api "org.codehaus.woodstox:stax2-api:4.2.2"
79-
api "org.ow2.asm:asm:9.3"
79+
api "org.ow2.asm:asm:9.7.1"
8080

8181
runtimeOnly "com.google.code.gson:gson:2.11.0"
8282
runtimeOnly "org.cryptomator:siv-mode:1.5.2"

x-pack/plugin/security/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ dependencies {
8686
* Eclipse can't pick up the shadow dependency so we point it at the unmodified version of the library
8787
* so it can compile things.
8888
*/
89-
api "com.nimbusds:nimbus-jose-jwt:9.37.3"
89+
api "com.nimbusds:nimbus-jose-jwt:10.0.1"
9090
}
91-
api "com.nimbusds:lang-tag:1.4.4"
91+
api "com.nimbusds:lang-tag:1.7"
9292
api "com.sun.mail:jakarta.mail:1.6.3"
9393
api "net.jcip:jcip-annotations:1.0"
9494
api "net.minidev:json-smart:2.5.2"
95-
api "net.minidev:accessors-smart:2.4.2"
96-
api "org.ow2.asm:asm:8.0.1"
95+
api "net.minidev:accessors-smart:2.5.2"
96+
api "org.ow2.asm:asm:9.7.1"
9797

9898
testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
9999

x-pack/plugin/security/lib/nimbus-jose-jwt-modified-part1/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'com.gradleup.shadow'
1111
// See the build.gradle file in the parent directory for an explanation of this unusual build
1212

1313
dependencies {
14-
implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
14+
implementation "com.nimbusds:nimbus-jose-jwt:10.0.1"
1515
}
1616

1717
tasks.named('shadowJar').configure {

x-pack/plugin/security/lib/nimbus-jose-jwt-modified/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apply plugin: 'com.gradleup.shadow'
1111
// See the build.gradle file in the parent directory for an explanation of this unusual build
1212

1313
dependencies {
14-
implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
14+
implementation "com.nimbusds:nimbus-jose-jwt:10.0.1"
1515
implementation project(path: xpackModule('security:lib:nimbus-jose-jwt-modified-part2'), configuration: 'shadow')
1616
}
1717

0 commit comments

Comments
 (0)