Merge branch '11.1.x' into 12.0.x

Author: semaphore-agent-production[bot]

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.confluent</groupId>
         <artifactId>common</artifactId>
-        <version>6.0.3</version>
+        <version>6.0.15</version>
     </parent>
 
     <groupId>io.confluent</groupId>
@@ -169,12 +169,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <!-- Use a repackaged version of log4j with security patches. Default log4j v1.2 is a transitive dependency of connect-runtime, but it is excluded in common/pom.xml -->
-        <dependency>
-            <groupId>io.confluent</groupId>
-            <artifactId>confluent-log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>connect-runtime</artifactId>

src/test/java/io/confluent/connect/elasticsearch/helper/ElasticsearchContainer.java

@@ -352,6 +352,15 @@ private void buildImage(DockerfileBuilder builder) {
 
     if (isSslEnabled()) {
       log.info("Building Elasticsearch image with SSL configuration");
+
+      // Yum is not working by default, so enable it
+      builder
+          .run("sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*")
+          .run("sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*");
+      // SSL cert issues with the newer installed java using hmacPBESHA256, which isn't
+      // supported by java 1.8
+      builder.run("yum install -y java-1.8.0-openjdk-headless");
+
       builder
           .copy("instances.yml", CONFIG_SSL_PATH + "/instances.yml")
           .copy("start-elasticsearch.sh", CONFIG_SSL_PATH + "/start-elasticsearch.sh")