From 76d8e86886fa05782847f4a1c996486b6857e2aa Mon Sep 17 00:00:00 2001
From: Jake Landis <jake.landis@elastic.co>
Date: Wed, 28 Sep 2022 15:21:03 -0500
Subject: [PATCH] [8.5] update snakeyaml dependency (#90414) (#90483)

---
 build-tools-internal/build.gradle       | 2 ++
 build-tools-internal/version.properties | 2 +-
 gradle/verification-metadata.xml        | 6 +++---
 libs/x-content/build.gradle             | 2 +-
 libs/x-content/impl/build.gradle        | 3 +--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build-tools-internal/build.gradle b/build-tools-internal/build.gradle
index ddc54fa448718..7387d5beafe21 100644
--- a/build-tools-internal/build.gradle
+++ b/build-tools-internal/build.gradle
@@ -217,6 +217,7 @@ configurations {
 dependencies {
   constraints {
       integTestImplementation('org.ow2.asm:asm:9.3')
+      implementation "org.yaml:snakeyaml:${versions.snakeyaml}"
   }
   components.all(JacksonAlignmentRule)
   constraints {
@@ -293,6 +294,7 @@ dependencies {
   testImplementation buildLibs.spock.junit4
   testImplementation buildLibs.json.assert
   integTestImplementation buildLibs.xmlunit.core
+
 }
 
 tasks.named('test').configure {
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
index df817eef22ae6..9c94747a80326 100644
--- a/build-tools-internal/version.properties
+++ b/build-tools-internal/version.properties
@@ -8,7 +8,7 @@ bundled_jdk = 18.0.2.1+1@db379da656dc47308e138f21b33976fa
 spatial4j         = 0.7
 jts               = 1.15.0
 jackson           = 2.13.3
-snakeyaml         = 1.26
+snakeyaml         = 1.33
 icu4j             = 68.2
 supercsv          = 2.4.0
 log4j             = 2.18.0
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a630b05840f26..e9139dc0c25da 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4002,9 +4002,9 @@
             <sha256 value="664543f6a054e314ea0e6ff5118c1e2c32a2f1c3f90b138e45064c17ff3962fc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.yaml" name="snakeyaml" version="1.30">
-         <artifact name="snakeyaml-1.30.jar">
-            <sha256 value="f43a4e40a946b8cdfd0321bc1c9a839bc3f119c57e4ca84fb87c367f51c8b2b3" origin="Generated by Gradle"/>
+      <component group="org.yaml" name="snakeyaml" version="1.33">
+         <artifact name="snakeyaml-1.33.jar">
+            <sha256 value="11ff459788f0a2d781f56a4a86d7e69202cebacd0273d5269c4ae9f02f3fd8f0" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="ua.net.nlp" name="morfologik-ukrainian-search" version="3.7.5">
diff --git a/libs/x-content/build.gradle b/libs/x-content/build.gradle
index 7fe46656f7ea9..bf110b9adb532 100644
--- a/libs/x-content/build.gradle
+++ b/libs/x-content/build.gradle
@@ -78,7 +78,7 @@ def generateProviderManifest = tasks.register("generateProviderManifest") {
   }
 }
 
-def generateProviderImpl = tasks.register("generateProviderImpl", Copy) {
+def generateProviderImpl = tasks.register("generateProviderImpl", Sync) {
   destinationDir = new File(generatedResourcesDir, "impl")
   into("IMPL-JARS/x-content") {
     from(configurations.providerImpl)
diff --git a/libs/x-content/impl/build.gradle b/libs/x-content/impl/build.gradle
index 8764250ab37ca..f7a7c6a173ee7 100644
--- a/libs/x-content/impl/build.gradle
+++ b/libs/x-content/impl/build.gradle
@@ -11,7 +11,6 @@ apply plugin: 'elasticsearch.java'
 archivesBaseName = "x-content-impl"
 
 String jacksonVersion = "2.13.2"
-String snakeyamlVersion = "1.30"
 
 dependencies {
   compileOnly project(':libs:elasticsearch-core')
@@ -20,7 +19,7 @@ dependencies {
   implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jacksonVersion}"
   implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${jacksonVersion}"
   implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
-  implementation "org.yaml:snakeyaml:${snakeyamlVersion}"
+  implementation "org.yaml:snakeyaml:${versions.snakeyaml}"
 
   testImplementation(project(":test:framework")) {
     exclude group: 'org.elasticsearch', module: 'elasticsearch-x-content'