Skip to content

Commit 42dc22e

Browse files
authored
Bump com.azure:azure-identity from 1.13.2 to 1.14.2 in /plugins/repository-azure (#16778)
* Bump com.azure:azure-identity from 1.13.2 to 1.14.2 in /plugins/repository-azure Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add to CHANGELOG Signed-off-by: Craig Perkins <cwperx@amazon.com> * Add tearDown Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent d199096 commit 42dc22e

File tree

5 files changed

+16
-2
lines changed

5 files changed

+16
-2
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4040
- Bump `org.apache.logging.log4j:log4j-core` from 2.24.1 to 2.24.2 ([#16718](https://github.com/opensearch-project/OpenSearch/pull/16718))
4141
- Bump `jackson` from 2.17.2 to 2.18.2 ([#16733](https://github.com/opensearch-project/OpenSearch/pull/16733))
4242
- Bump `ch.qos.logback:logback-classic` from 1.2.13 to 1.5.12 ([#16716](https://github.com/opensearch-project/OpenSearch/pull/16716))
43+
- Bump `com.azure:azure-identity` from 1.13.2 to 1.14.2 ([#16778](https://github.com/opensearch-project/OpenSearch/pull/16778))
4344

4445
### Changed
4546
- Indexed IP field supports `terms_query` with more than 1025 IP masks [#16391](https://github.com/opensearch-project/OpenSearch/pull/16391)

plugins/repository-azure/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ dependencies {
5757
api "io.netty:netty-transport-native-unix-common:${versions.netty}"
5858
implementation project(':modules:transport-netty4')
5959
api 'com.azure:azure-storage-blob:12.28.1'
60-
api 'com.azure:azure-identity:1.13.2'
60+
api 'com.azure:azure-identity:1.14.2'
6161
// Start of transitive dependencies for azure-identity
6262
api 'com.microsoft.azure:msal4j-persistence-extension:1.3.0'
6363
api "net.java.dev.jna:jna-platform:${versions.jna}"
@@ -108,6 +108,7 @@ thirdPartyAudit {
108108
// Optional and not enabled by Elasticsearch
109109
'com.google.common.util.concurrent.internal.InternalFutureFailureAccess',
110110
'com.google.common.util.concurrent.internal.InternalFutures',
111+
'com.azure.core.credential.ProofOfPossessionOptions',
111112
'com.azure.storage.internal.avro.implementation.AvroObject',
112113
'com.azure.storage.internal.avro.implementation.AvroReader',
113114
'com.azure.storage.internal.avro.implementation.AvroReaderFactory',

plugins/repository-azure/licenses/azure-identity-1.13.2.jar.sha1

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
85c45e2add38742009a9c5070d2a9d8f192cf8db

plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureStorageServiceTests.java

+12
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.opensearch.common.unit.TimeValue;
4444
import org.opensearch.core.common.Strings;
4545
import org.opensearch.test.OpenSearchTestCase;
46+
import org.junit.After;
4647
import org.junit.AfterClass;
4748

4849
import java.io.IOException;
@@ -58,6 +59,7 @@
5859
import java.util.Map;
5960

6061
import reactor.core.scheduler.Schedulers;
62+
import reactor.netty.http.HttpResources;
6163

6264
import static org.hamcrest.Matchers.containsInAnyOrder;
6365
import static org.hamcrest.Matchers.emptyString;
@@ -72,6 +74,16 @@ public static void shutdownSchedulers() {
7274
Schedulers.shutdownNow();
7375
}
7476

77+
@After
78+
public void tearDown() throws Exception {
79+
try {
80+
// Properly shut down resources
81+
HttpResources.disposeLoopsAndConnectionsLater().block();
82+
} finally {
83+
super.tearDown();
84+
}
85+
}
86+
7587
public void testReadSecuredSettings() {
7688
final Settings settings = Settings.builder()
7789
.setSecureSettings(buildSecureSettings())

0 commit comments

Comments
 (0)