From 34263cb2cb82bdde8535bae48fe5534411774d03 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Jun 2024 08:16:30 -0400 Subject: [PATCH 1/5] Update dependency com.azure:azure-identity to v1.12.2 Signed-off-by: Craig Perkins --- plugins/repository-azure/build.gradle | 2 +- .../repository-azure/licenses/azure-identity-1.11.4.jar.sha1 | 1 - .../repository-azure/licenses/azure-identity-1.12.2.jar.sha1 | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 plugins/repository-azure/licenses/azure-identity-1.11.4.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 0fd30af71dd0a..2d5a1a34f47ab 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -57,7 +57,7 @@ dependencies { api "io.netty:netty-transport-native-unix-common:${versions.netty}" implementation project(':modules:transport-netty4') api 'com.azure:azure-storage-blob:12.23.0' - api 'com.azure:azure-identity:1.11.4' + api 'com.azure:azure-identity:1.12.2' // Start of transitive dependencies for azure-identity api 'com.microsoft.azure:msal4j-persistence-extension:1.2.0' api "net.java.dev.jna:jna-platform:${versions.jna}" diff --git a/plugins/repository-azure/licenses/azure-identity-1.11.4.jar.sha1 b/plugins/repository-azure/licenses/azure-identity-1.11.4.jar.sha1 deleted file mode 100644 index c8d98ba9c8ad2..0000000000000 --- a/plugins/repository-azure/licenses/azure-identity-1.11.4.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -59b5ce48888f638b80d85ef5aa0e22a265d3dc89 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 b/plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 new file mode 100644 index 0000000000000..73a9ec161e5ae --- /dev/null +++ b/plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 @@ -0,0 +1 @@ +e12bc63202063589f68318bd5a1b4d1a8ae88fb6 \ No newline at end of file From 918a49d3f9857f13b4e8627e6aac5680a5d508f1 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Jun 2024 08:19:09 -0400 Subject: [PATCH 2/5] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8589298997f7f..bd89674c00514 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.apache.commons:commons-configuration2` from 2.10.1 to 2.11.0 ([#14399](https://github.com/opensearch-project/OpenSearch/pull/14399)) - Bump `com.gradle.develocity` from 3.17.4 to 3.17.5 ([#14397](https://github.com/opensearch-project/OpenSearch/pull/14397)) - Bump `opentelemetry` from 1.36.0 to 1.39.0 ([#14457](https://github.com/opensearch-project/OpenSearch/pull/14457)) +- Bump `azure-identity` from 1.11.4 to 1.12.2 ([#14506](https://github.com/opensearch-project/OpenSearch/pull/14506)) ### Changed - unsignedLongRangeQuery now returns MatchNoDocsQuery if the lower bounds are greater than the upper bounds ([#14416](https://github.com/opensearch-project/OpenSearch/pull/14416)) From 2adc1fc4ce8d9b6d47095e39045259c7eae7dc75 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Jun 2024 08:51:50 -0400 Subject: [PATCH 3/5] Bump msal4j from 1.14.3 to 1.15.1 Signed-off-by: Craig Perkins --- plugins/repository-azure/build.gradle | 2 +- plugins/repository-azure/licenses/msal4j-1.14.3.jar.sha1 | 1 - plugins/repository-azure/licenses/msal4j-1.15.1.jar.sha1 | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 plugins/repository-azure/licenses/msal4j-1.14.3.jar.sha1 create mode 100644 plugins/repository-azure/licenses/msal4j-1.15.1.jar.sha1 diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 2d5a1a34f47ab..43b31422c5521 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -61,7 +61,7 @@ dependencies { // Start of transitive dependencies for azure-identity api 'com.microsoft.azure:msal4j-persistence-extension:1.2.0' api "net.java.dev.jna:jna-platform:${versions.jna}" - api 'com.microsoft.azure:msal4j:1.14.3' + api 'com.microsoft.azure:msal4j:1.15.1' api 'com.nimbusds:oauth2-oidc-sdk:11.9.1' api 'com.nimbusds:nimbus-jose-jwt:9.40' api 'com.nimbusds:content-type:2.3' diff --git a/plugins/repository-azure/licenses/msal4j-1.14.3.jar.sha1 b/plugins/repository-azure/licenses/msal4j-1.14.3.jar.sha1 deleted file mode 100644 index 2a6e42e3f2b48..0000000000000 --- a/plugins/repository-azure/licenses/msal4j-1.14.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -117b28c41bd760f979ed1b6467c5ec491f0d4d60 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/msal4j-1.15.1.jar.sha1 b/plugins/repository-azure/licenses/msal4j-1.15.1.jar.sha1 new file mode 100644 index 0000000000000..797f21d0d4995 --- /dev/null +++ b/plugins/repository-azure/licenses/msal4j-1.15.1.jar.sha1 @@ -0,0 +1 @@ +cd1daa94b81bd97153536b661c31295f99cbb8e7 \ No newline at end of file From d458c68922219b06d677937bcafa55060b331a21 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Jun 2024 08:52:42 -0400 Subject: [PATCH 4/5] Add to CHANGELOG Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd89674c00514..d4c696c98b86a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.apache.commons:commons-configuration2` from 2.10.1 to 2.11.0 ([#14399](https://github.com/opensearch-project/OpenSearch/pull/14399)) - Bump `com.gradle.develocity` from 3.17.4 to 3.17.5 ([#14397](https://github.com/opensearch-project/OpenSearch/pull/14397)) - Bump `opentelemetry` from 1.36.0 to 1.39.0 ([#14457](https://github.com/opensearch-project/OpenSearch/pull/14457)) -- Bump `azure-identity` from 1.11.4 to 1.12.2 ([#14506](https://github.com/opensearch-project/OpenSearch/pull/14506)) +- Bump `azure-identity` from 1.11.4 to 1.12.2, Bump `msal4j` from 1.14.3 to 1.15.1 ([#14506](https://github.com/opensearch-project/OpenSearch/pull/14506)) ### Changed - unsignedLongRangeQuery now returns MatchNoDocsQuery if the lower bounds are greater than the upper bounds ([#14416](https://github.com/opensearch-project/OpenSearch/pull/14416)) From 376043b4dd59e2941138642c48ca3ea6712ae8c7 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Sat, 22 Jun 2024 09:50:33 -0400 Subject: [PATCH 5/5] Address review feedback Signed-off-by: Craig Perkins --- CHANGELOG.md | 2 +- plugins/repository-azure/build.gradle | 4 ++-- .../repository-azure/licenses/azure-identity-1.12.2.jar.sha1 | 1 - .../repository-azure/licenses/azure-identity-1.13.0.jar.sha1 | 1 + .../licenses/msal4j-persistence-extension-1.2.0.jar.sha1 | 1 - .../licenses/msal4j-persistence-extension-1.3.0.jar.sha1 | 1 + 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 create mode 100644 plugins/repository-azure/licenses/azure-identity-1.13.0.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/msal4j-persistence-extension-1.2.0.jar.sha1 create mode 100644 plugins/repository-azure/licenses/msal4j-persistence-extension-1.3.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index d4c696c98b86a..ba1279b4cf458 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.apache.commons:commons-configuration2` from 2.10.1 to 2.11.0 ([#14399](https://github.com/opensearch-project/OpenSearch/pull/14399)) - Bump `com.gradle.develocity` from 3.17.4 to 3.17.5 ([#14397](https://github.com/opensearch-project/OpenSearch/pull/14397)) - Bump `opentelemetry` from 1.36.0 to 1.39.0 ([#14457](https://github.com/opensearch-project/OpenSearch/pull/14457)) -- Bump `azure-identity` from 1.11.4 to 1.12.2, Bump `msal4j` from 1.14.3 to 1.15.1 ([#14506](https://github.com/opensearch-project/OpenSearch/pull/14506)) +- Bump `azure-identity` from 1.11.4 to 1.13.0, Bump `msal4j` from 1.14.3 to 1.15.1, Bump `msal4j-persistence-extension` from 1.2.0 to 1.3.0 ([#14506](https://github.com/opensearch-project/OpenSearch/pull/14506)) ### Changed - unsignedLongRangeQuery now returns MatchNoDocsQuery if the lower bounds are greater than the upper bounds ([#14416](https://github.com/opensearch-project/OpenSearch/pull/14416)) diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 43b31422c5521..f3aa64316b667 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -57,9 +57,9 @@ dependencies { api "io.netty:netty-transport-native-unix-common:${versions.netty}" implementation project(':modules:transport-netty4') api 'com.azure:azure-storage-blob:12.23.0' - api 'com.azure:azure-identity:1.12.2' + api 'com.azure:azure-identity:1.13.0' // Start of transitive dependencies for azure-identity - api 'com.microsoft.azure:msal4j-persistence-extension:1.2.0' + api 'com.microsoft.azure:msal4j-persistence-extension:1.3.0' api "net.java.dev.jna:jna-platform:${versions.jna}" api 'com.microsoft.azure:msal4j:1.15.1' api 'com.nimbusds:oauth2-oidc-sdk:11.9.1' diff --git a/plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 b/plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 deleted file mode 100644 index 73a9ec161e5ae..0000000000000 --- a/plugins/repository-azure/licenses/azure-identity-1.12.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e12bc63202063589f68318bd5a1b4d1a8ae88fb6 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/azure-identity-1.13.0.jar.sha1 b/plugins/repository-azure/licenses/azure-identity-1.13.0.jar.sha1 new file mode 100644 index 0000000000000..b59c2a3be5c92 --- /dev/null +++ b/plugins/repository-azure/licenses/azure-identity-1.13.0.jar.sha1 @@ -0,0 +1 @@ +54b44a74636322d06e9dc42d611a9f12a0966790 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/msal4j-persistence-extension-1.2.0.jar.sha1 b/plugins/repository-azure/licenses/msal4j-persistence-extension-1.2.0.jar.sha1 deleted file mode 100644 index cfcf7548b7694..0000000000000 --- a/plugins/repository-azure/licenses/msal4j-persistence-extension-1.2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1111a95878de8745ddc9de132df18ebd9ca7024d \ No newline at end of file diff --git a/plugins/repository-azure/licenses/msal4j-persistence-extension-1.3.0.jar.sha1 b/plugins/repository-azure/licenses/msal4j-persistence-extension-1.3.0.jar.sha1 new file mode 100644 index 0000000000000..9c5909e7ff240 --- /dev/null +++ b/plugins/repository-azure/licenses/msal4j-persistence-extension-1.3.0.jar.sha1 @@ -0,0 +1 @@ +8a8ef1517d27a5b4de1512ef94679bdb59f210b6 \ No newline at end of file