Merge remote-tracking branch 'elastic/main' into fix-netty-leak

original-brownbear · Jul 2, 2023 · 1859bcf · 1859bcf
2 parents bd1fda5 + fdcecd9
commit 1859bcf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/build-tools-internal/build.gradle b/build-tools-internal/build.gradle
@@ -240,7 +240,7 @@ dependencies {
  // ensuring brought asm version brought in by spock is up-to-date
  testImplementation buildLibs.asm
  integTestImplementation buildLibs.asm
- integTestImplementation('org.ow2.asm:asm:9.4')
+ integTestImplementation('org.ow2.asm:asm:9.5')
  api("org.yaml:snakeyaml") {
  version { strictly(versions.snakeyaml) }
  }

diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle
@@ -19,8 +19,8 @@ dependencies {
  compileOnly project(":libs:elasticsearch-cli")
  implementation project(":libs:elasticsearch-plugin-api")
  implementation project(":libs:elasticsearch-plugin-scanner")
- implementation 'org.ow2.asm:asm:9.4'
- implementation 'org.ow2.asm:asm-tree:9.4'
+ implementation 'org.ow2.asm:asm:9.5'
+ implementation 'org.ow2.asm:asm-tree:9.5'
 
  api "org.bouncycastle:bcpg-fips:1.0.4"
  api "org.bouncycastle:bc-fips:1.0.2"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -3606,6 +3606,11 @@
  <sha256 value="39d0e2b3dc45af65a09b097945750a94a126e052e124f93468443a1d0e15f381" origin="Generated by Gradle"/>
  </artifact>
  </component>
+ <component group="org.ow2.asm" name="asm" version="9.5">
+ <artifact name="asm-9.5.jar">
+ <sha256 value="b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
  <component group="org.ow2.asm" name="asm-analysis" version="7.2">
  <artifact name="asm-analysis-7.2.jar">
  <sha256 value="be922aae60ff1ff1768e8e6544a38a7f92bd0a6d6b0b9791f94955d1bd453de2" origin="Generated by Gradle"/>
@@ -3666,6 +3671,11 @@
  <sha256 value="c42d479cf24566a21eb20af7eeaeef4e86bdb4a886306cf72f483b65e75b2acf" origin="Generated by Gradle"/>
  </artifact>
  </component>
+ <component group="org.ow2.asm" name="asm-tree" version="9.5">
+ <artifact name="asm-tree-9.5.jar">
+ <sha256 value="3c33a648191079aeaeaeb7c19a49b153952f9e40fe86fbac5205554ddd9acd94" origin="Generated by Gradle"/>
+ </artifact>
+ </component>
  <component group="org.ow2.asm" name="asm-util" version="7.2">
  <artifact name="asm-util-7.2.jar">
  <sha256 value="6e24913b021ffacfe8e7e053d6e0ccc731941148cfa078d4f1ed3d96904530f8" origin="Generated by Gradle"/>

diff --git a/libs/plugin-scanner/build.gradle b/libs/plugin-scanner/build.gradle
@@ -19,8 +19,8 @@ dependencies {
  api project(':libs:elasticsearch-plugin-api')
  api project(":libs:elasticsearch-x-content")
 
- api 'org.ow2.asm:asm:9.4'
- api 'org.ow2.asm:asm-tree:9.4'
+ api 'org.ow2.asm:asm:9.5'
+ api 'org.ow2.asm:asm-tree:9.5'
 
  testImplementation "junit:junit:${versions.junit}"
  testImplementation(project(":test:framework")) {