Merge branch 'main' into dependabot/gradle/distribution/packages/com.…

…netflix.nebula.ospackage-base-11.5.0 Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
opensearch-project · Oct 2, 2023 · 12d0050 · 12d0050
2 parents e56ae15 + 6003560
commit 12d0050
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -109,6 +109,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.bouncycastle:bcmail-jdk15to18` from 1.75 to 1.76 ([10219](https://github.com/opensearch-project/OpenSearch/pull/10219))`
 - Bump Lucene from 9.7.0 to 9.8.0 ([10276](https://github.com/opensearch-project/OpenSearch/pull/10276))
 - Bump `com.netflix.nebula.ospackage-base` from 11.4.0 to 11.5.0 ([#10295](https://github.com/opensearch-project/OpenSearch/pull/10295))
+- Bump asm from 9.5 to 9.6 ([#10302](https://github.com/opensearch-project/OpenSearch/pull/10302))
 
 ### Changed
 - Add instrumentation in rest and network layer. ([#9415](https://github.com/opensearch-project/OpenSearch/pull/9415))

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -16,7 +16,7 @@ icu4j             = 70.1
 supercsv          = 2.4.0
 log4j             = 2.20.0
 slf4j             = 1.7.36
-asm               = 9.5
+asm               = 9.6
 jettison          = 1.5.4
 woodstox          = 6.4.0
 kotlin            = 1.7.10

diff --git a/modules/lang-expression/licenses/asm-9.5.jar.sha1 b/modules/lang-expression/licenses/asm-9.5.jar.sha1
diff --git a/modules/lang-expression/licenses/asm-9.6.jar.sha1 b/modules/lang-expression/licenses/asm-9.6.jar.sha1
@@ -0,0 +1 @@
+aa205cf0a06dbd8e04ece91c0b37c3f5d567546a
diff --git a/modules/lang-expression/licenses/asm-commons-9.5.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.5.jar.sha1
diff --git a/modules/lang-expression/licenses/asm-commons-9.6.jar.sha1 b/modules/lang-expression/licenses/asm-commons-9.6.jar.sha1
@@ -0,0 +1 @@
+f1a9e5508eff490744144565c47326c8648be309
diff --git a/modules/lang-expression/licenses/asm-tree-9.5.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.5.jar.sha1
diff --git a/modules/lang-expression/licenses/asm-tree-9.6.jar.sha1 b/modules/lang-expression/licenses/asm-tree-9.6.jar.sha1
@@ -0,0 +1 @@
+c0cdda9d211e965d2a4448aa3fd86110f2f8c2de
diff --git a/modules/lang-painless/licenses/asm-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-9.5.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-9.6.jar.sha1 b/modules/lang-painless/licenses/asm-9.6.jar.sha1
@@ -0,0 +1 @@
+aa205cf0a06dbd8e04ece91c0b37c3f5d567546a
diff --git a/modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.5.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-analysis-9.6.jar.sha1 b/modules/lang-painless/licenses/asm-analysis-9.6.jar.sha1
@@ -0,0 +1 @@
+9ce6c7b174bd997fc2552dff47964546bd7a5ec3
diff --git a/modules/lang-painless/licenses/asm-commons-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-commons-9.5.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-commons-9.6.jar.sha1 b/modules/lang-painless/licenses/asm-commons-9.6.jar.sha1
@@ -0,0 +1 @@
+f1a9e5508eff490744144565c47326c8648be309
diff --git a/modules/lang-painless/licenses/asm-tree-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-tree-9.5.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-tree-9.6.jar.sha1 b/modules/lang-painless/licenses/asm-tree-9.6.jar.sha1
@@ -0,0 +1 @@
+c0cdda9d211e965d2a4448aa3fd86110f2f8c2de
diff --git a/modules/lang-painless/licenses/asm-util-9.5.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.5.jar.sha1
diff --git a/modules/lang-painless/licenses/asm-util-9.6.jar.sha1 b/modules/lang-painless/licenses/asm-util-9.6.jar.sha1
@@ -0,0 +1 @@
+f77caf84eb93786a749b2baa40865b9613e3eaee