Merge remote-tracking branch 'upstream/main' into replace-gradle-blac…

…klist
opensearch-project · Apr 5, 2022 · b2afd3c · b2afd3c
2 parents ce57ddb + 6103010
commit b2afd3c
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 11 deletions.
diff --git a/libs/grok/build.gradle b/libs/grok/build.gradle
@@ -31,7 +31,7 @@
 dependencies {
   api 'org.jruby.joni:joni:2.1.41'
   // joni dependencies:
-  api 'org.jruby.jcodings:jcodings:1.0.44'
+  api 'org.jruby.jcodings:jcodings:1.0.57'
 
   testImplementation(project(":test:framework")) {
     exclude group: 'org.opensearch', module: 'opensearch-grok'
@@ -41,7 +41,3 @@ dependencies {
 tasks.named('forbiddenApisMain').configure {
   replaceSignatureFiles 'jdk-signatures'
 }
-
-thirdPartyAudit.ignoreMissingClasses(
-  'org.jcodings.unicode.UnicodeCodeRange'
-)
diff --git a/libs/grok/licenses/jcodings-1.0.44.jar.sha1 b/libs/grok/licenses/jcodings-1.0.44.jar.sha1
diff --git a/libs/grok/licenses/jcodings-1.0.57.jar.sha1 b/libs/grok/licenses/jcodings-1.0.57.jar.sha1
@@ -0,0 +1 @@
+603a9ceac39cbf7f6f27fe18b2fded4714319b0a
diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle
@@ -46,7 +46,7 @@ opensearchplugin {
 dependencies {
   api 'com.azure:azure-core:1.26.0'
   api 'com.azure:azure-storage-common:12.15.0'
-  api 'com.azure:azure-core-http-netty:1.11.8'
+  api 'com.azure:azure-core-http-netty:1.11.9'
   api "io.netty:netty-codec-dns:${versions.netty}"
   api "io.netty:netty-codec-socks:${versions.netty}"
   api "io.netty:netty-codec-http2:${versions.netty}"

diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.11.8.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.11.8.jar.sha1
diff --git a/plugins/repository-azure/licenses/azure-core-http-netty-1.11.9.jar.sha1 b/plugins/repository-azure/licenses/azure-core-http-netty-1.11.9.jar.sha1
@@ -0,0 +1 @@
+1d1f34b3e60db038f3913007a2706a820383dc26
diff --git a/...epository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java b/...epository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java
@@ -91,8 +91,7 @@ final class AzureStorageSettings {
         AZURE_CLIENT_PREFIX_KEY,
         "endpoint_suffix",
         key -> Setting.simpleString(key, Property.NodeScope),
-        () -> ACCOUNT_SETTING,
-        () -> KEY_SETTING
+        () -> ACCOUNT_SETTING
     );
 
     // The overall operation timeout

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/tasks.list/10_basic.yml
@@ -1,6 +1,8 @@
 ---
 "tasks_list test":
   - skip:
+      version: "all"
+      reason: "AwaitsFix https://github.com/opensearch-project/OpenSearch/issues/2757"
       features: [arbitrary_key]
 
   - do:
@@ -32,4 +34,3 @@
 
   - is_true: tasks
   - match: { tasks.0.headers.X-Opaque-Id: "That is me" }
-