Cherrypick a few more Log4j fixes. #16352

Co-authored-by: tvalentyn <tvalentyn@users.noreply.github.com>
Co-authored-by: Ahmet Altay <aaltay@gmail.com>
Co-authored-by: Ada Wong <rsl4@foxmail.com>

Author: 3 people

buildSrc/build.gradle.kts

@@ -31,13 +31,14 @@ repositories {
     url = uri("https://repo.spring.io/plugins-release/")
     content { includeGroup("io.spring.gradle") }
   }
+  flatDir { dirs("jarlibs") }
 }
 
 // Dependencies on other plugins used when this plugin is invoked
 dependencies {
   compile(gradleApi())
   compile(localGroovy())
-  compile("com.github.jengelman.gradle.plugins:shadow:6.1.0")
+  compile("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT")
   compile("gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0")
 
   runtime("net.ltgt.gradle:gradle-apt-plugin:0.21")                                                    // Enable a Java annotation processor
@@ -48,7 +49,7 @@ dependencies {
   runtime("gradle.plugin.com.github.blindpirate:gogradle:0.11.4")                                      // Enable Go code compilation
   runtime("gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.0")                             // Enable building Docker containers
   runtime("gradle.plugin.com.dorongold.plugins:task-tree:1.5")                                       // Adds a 'taskTree' task to print task dependency tree
-  runtime("com.github.jengelman.gradle.plugins:shadow:6.1.0")                                          // Enable shading Java dependencies
+  runtime("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT")                        // Enable shading Java dependencies
   runtime("ca.coglinc:javacc-gradle-plugin:2.4.0")                                                     // Enable the JavaCC parser generator
   runtime("net.linguica.gradle:maven-settings-plugin:0.5")
   runtime("gradle.plugin.io.pry.gradle.offline_dependencies:gradle-offline-dependencies-plugin:0.5.0") // Enable creating an offline repository

buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar

@@ -27,7 +27,7 @@ enableJavaPerformanceTesting()
 description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 5.x"
 ext.summary = "Tests of ElasticsearchIO on Elasticsearch 5.x"
 
-def log4j_version = "2.16.0"
+def log4j_version = "2.17.0"
 def elastic_search_version = "5.6.3"
 
 configurations.all {

sdks/java/io/elasticsearch-tests/elasticsearch-tests-5/build.gradle

@@ -27,7 +27,7 @@ enableJavaPerformanceTesting()
 description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 6.x"
 ext.summary = "Tests of ElasticsearchIO on Elasticsearch 6.x"
 
-def log4j_version = "2.16.0"
+def log4j_version = "2.17.0"
 def elastic_search_version = "6.4.0"
 
 configurations.all {

sdks/java/io/elasticsearch-tests/elasticsearch-tests-6/build.gradle

@@ -27,7 +27,7 @@ enableJavaPerformanceTesting()
 description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: 7.x"
 ext.summary = "Tests of ElasticsearchIO on Elasticsearch 7.x"
 
-def log4j_version = "2.16.0"
+def log4j_version = "2.17.0"
 def elastic_search_version = "7.13.4"
 
 configurations.all {

sdks/java/io/elasticsearch-tests/elasticsearch-tests-7/build.gradle

@@ -25,7 +25,7 @@ applyJavaNature(
 description = "Apache Beam :: SDKs :: Java :: IO :: Elasticsearch-Tests :: Common"
 ext.summary = "Common test classes for ElasticsearchIO"
 
-def log4j_version = "2.16.0"
+def log4j_version = "2.17.0"
 def elastic_search_version = "7.9.2"
 
 configurations.all {