From 8abe6f3016157d4d4a0f8aeddb082920b8168a23 Mon Sep 17 00:00:00 2001
From: Rostislav Svoboda <rsvoboda@redhat.com>
Date: Tue, 10 Sep 2024 15:42:30 +0200
Subject: [PATCH 1/3] Use official ryuk instead of quay.io/infinispan-test/ryuk

quay.io/infinispan-test/ryuk has issues on RHEL8 aarch 64
Override was introduced in https://github.com/infinispan/infinispan/pull/8905

(cherry picked from commit 82a02b0d75362bed9770887c2a4e5e786ad7fbeb)
---
 .../src/main/resources/testcontainers.properties                 | 1 +
 .../src/main/resources/testcontainers.properties                 | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 infinispan-cache-quickstart/src/main/resources/testcontainers.properties
 create mode 100644 infinispan-client-quickstart/src/main/resources/testcontainers.properties

diff --git a/infinispan-cache-quickstart/src/main/resources/testcontainers.properties b/infinispan-cache-quickstart/src/main/resources/testcontainers.properties
new file mode 100644
index 0000000000..80100cd73a
--- /dev/null
+++ b/infinispan-cache-quickstart/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.image=testcontainers/ryuk:0.8.1
\ No newline at end of file
diff --git a/infinispan-client-quickstart/src/main/resources/testcontainers.properties b/infinispan-client-quickstart/src/main/resources/testcontainers.properties
new file mode 100644
index 0000000000..80100cd73a
--- /dev/null
+++ b/infinispan-client-quickstart/src/main/resources/testcontainers.properties
@@ -0,0 +1 @@
+ryuk.container.image=testcontainers/ryuk:0.8.1
\ No newline at end of file

From 77e94e5762edea307512afd725db536ccbf6a53f Mon Sep 17 00:00:00 2001
From: Rostislav Svoboda <rsvoboda@redhat.com>
Date: Tue, 10 Sep 2024 15:19:58 +0200
Subject: [PATCH 2/3] Bump confluentinc/cp-kafka image to 7.7.0 for aarch64
 support

(cherry picked from commit 7a41c0a8f954ecec8210f7e203f14d2b8a8822a2)
---
 .../src/test/java/org/acme/context/prices/KafkaResource.java    | 2 +-
 .../acme/kafka/streams/aggregator/streams/KafkaResource.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/context-propagation-quickstart/src/test/java/org/acme/context/prices/KafkaResource.java b/context-propagation-quickstart/src/test/java/org/acme/context/prices/KafkaResource.java
index a59124faaa..a0d1595689 100644
--- a/context-propagation-quickstart/src/test/java/org/acme/context/prices/KafkaResource.java
+++ b/context-propagation-quickstart/src/test/java/org/acme/context/prices/KafkaResource.java
@@ -9,7 +9,7 @@
 
 public class KafkaResource implements QuarkusTestResourceLifecycleManager {
 
-    private final KafkaContainer kafka = new KafkaContainer();
+    private final KafkaContainer kafka = new KafkaContainer("7.7.0");
 
     @Override
     public Map<String, String> start() {
diff --git a/kafka-streams-quickstart/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/KafkaResource.java b/kafka-streams-quickstart/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/KafkaResource.java
index a54c330d9f..66aaff2da7 100644
--- a/kafka-streams-quickstart/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/KafkaResource.java
+++ b/kafka-streams-quickstart/aggregator/src/test/java/org/acme/kafka/streams/aggregator/streams/KafkaResource.java
@@ -9,7 +9,7 @@
 
 public class KafkaResource implements QuarkusTestResourceLifecycleManager {
 
-    private final static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:5.4.3"));
+    private final static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.7.0"));
 
     @Override
     public Map<String, String> start() {

From b4e512f908c78ab08ef2fbea5990ad27f7504d94 Mon Sep 17 00:00:00 2001
From: Rostislav Svoboda <rsvoboda@redhat.com>
Date: Sat, 14 Sep 2024 08:22:33 +0200
Subject: [PATCH 3/3] Bump jacoco-maven-plugin to 0.8.12 to fix warnings with
 Java 21

There were more than 100 warnings with stacktraces saying java.lang.IllegalArgumentException: Unsupported class file major version 65
Jacoco supports Java 21 starting with 0.8.11

(cherry picked from commit 457d51cc2550adfa7c79f3f6f34c61bcd97b6f01)
---
 tests-with-coverage-quickstart/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests-with-coverage-quickstart/pom.xml b/tests-with-coverage-quickstart/pom.xml
index 305aa9466d..c55f4f786c 100644
--- a/tests-with-coverage-quickstart/pom.xml
+++ b/tests-with-coverage-quickstart/pom.xml
@@ -11,7 +11,7 @@
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
         <quarkus.platform.version>3.15.0.CR1</quarkus.platform.version>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
-        <jacoco.version>0.8.7</jacoco.version>
+        <jacoco.version>0.8.12</jacoco.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>