From 9b9d8c2ba734d3f21f4a2c5ea808fd795bc311f6 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 13:03:10 +0200 Subject: [PATCH 1/9] Bump version on internal OIDC depedency --- x-pack/plugin/security/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle index 0d60a9b06377c..7622a643bf53e 100644 --- a/x-pack/plugin/security/build.gradle +++ b/x-pack/plugin/security/build.gradle @@ -73,8 +73,8 @@ dependencies { api "com.nimbusds:lang-tag:1.4.4" api "com.sun.mail:jakarta.mail:1.6.3" api "net.jcip:jcip-annotations:1.0" - api "net.minidev:json-smart:2.4.2" - api "net.minidev:accessors-smart:2.4.2" + api "net.minidev:json-smart:2.4.10" + api "net.minidev:accessors-smart:2.4.10" api "org.ow2.asm:asm:8.0.1" testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}" From 85413484627ac582bac8d03ff0733e0a04385499 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 13:07:19 +0200 Subject: [PATCH 2/9] Undo --- x-pack/plugin/security/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle index 7622a643bf53e..a523a3b93fdb9 100644 --- a/x-pack/plugin/security/build.gradle +++ b/x-pack/plugin/security/build.gradle @@ -74,7 +74,7 @@ dependencies { api "com.sun.mail:jakarta.mail:1.6.3" api "net.jcip:jcip-annotations:1.0" api "net.minidev:json-smart:2.4.10" - api "net.minidev:accessors-smart:2.4.10" + api "net.minidev:accessors-smart:2.4.2" api "org.ow2.asm:asm:8.0.1" testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}" From 4d9d066c99bb846817fe43915425d102c962d3c1 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 13:19:09 +0200 Subject: [PATCH 3/9] Update 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 ce495ce26f68a..dd7e68d5d309e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1492,6 +1492,11 @@ + + + + + From a5e9677ad3cb08d6d25ccfd9ce845ae5fd9199a8 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 14:28:25 +0200 Subject: [PATCH 4/9] WIP bump direct dep --- gradle/verification-metadata.xml | 5 +++++ x-pack/plugin/security/build.gradle | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dd7e68d5d309e..00debbde36dd3 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -784,6 +784,11 @@ + + + + + diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle index a523a3b93fdb9..829d41b067dc4 100644 --- a/x-pack/plugin/security/build.gradle +++ b/x-pack/plugin/security/build.gradle @@ -68,7 +68,7 @@ dependencies { runtimeOnly "joda-time:joda-time:2.10.10" // Dependencies for oidc - api "com.nimbusds:oauth2-oidc-sdk:9.3.1" + api "com.nimbusds:oauth2-oidc-sdk:10.7.1" api "com.nimbusds:nimbus-jose-jwt:9.8.1" api "com.nimbusds:lang-tag:1.4.4" api "com.sun.mail:jakarta.mail:1.6.3" From 8b27037e7c9f04bcc0dd8717ba37c1d085580277 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 16:26:55 +0200 Subject: [PATCH 5/9] Revert "WIP bump direct dep" This reverts commit a5e9677ad3cb08d6d25ccfd9ce845ae5fd9199a8. --- gradle/verification-metadata.xml | 5 ----- x-pack/plugin/security/build.gradle | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 00debbde36dd3..dd7e68d5d309e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -784,11 +784,6 @@ - - - - - diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle index 829d41b067dc4..a523a3b93fdb9 100644 --- a/x-pack/plugin/security/build.gradle +++ b/x-pack/plugin/security/build.gradle @@ -68,7 +68,7 @@ dependencies { runtimeOnly "joda-time:joda-time:2.10.10" // Dependencies for oidc - api "com.nimbusds:oauth2-oidc-sdk:10.7.1" + api "com.nimbusds:oauth2-oidc-sdk:9.3.1" api "com.nimbusds:nimbus-jose-jwt:9.8.1" api "com.nimbusds:lang-tag:1.4.4" api "com.sun.mail:jakarta.mail:1.6.3" From 4fdf6aa8a318772b40ac2ddd7ec5163201157c72 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 16:28:27 +0200 Subject: [PATCH 6/9] Remove outdated entries --- gradle/verification-metadata.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dd7e68d5d309e..a33e61e2cbcc5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1487,21 +1487,11 @@ - - - - - - - - - - From a25b78bdaefd4e9b4c46940bbc96f89d60b7e3ea Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 17:18:17 +0200 Subject: [PATCH 7/9] Bring back deps --- gradle/verification-metadata.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a33e61e2cbcc5..dd7e68d5d309e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1487,11 +1487,21 @@ + + + + + + + + + + From e1bd2f5d5c68a635c1ed3e8cdf1843173290e127 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 18:42:34 +0200 Subject: [PATCH 8/9] Try removing one more time --- gradle/verification-metadata.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dd7e68d5d309e..a33e61e2cbcc5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1487,21 +1487,11 @@ - - - - - - - - - - From 62e2fce8a89f7d5bef4ac9d7992faaa6382b2177 Mon Sep 17 00:00:00 2001 From: Nikolaj Volgushev Date: Tue, 11 Apr 2023 19:56:35 +0200 Subject: [PATCH 9/9] Add back deps --- gradle/verification-metadata.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a33e61e2cbcc5..dd7e68d5d309e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1487,11 +1487,21 @@ + + + + + + + + + +