From 98f497a02fb302271888b73973575cd5e35234e9 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 17 Nov 2022 10:45:44 +0100
Subject: [PATCH 1/3] Remove a useless version: it's fixed in the BOM

---
 integration-tests/micrometer-prometheus/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/integration-tests/micrometer-prometheus/pom.xml b/integration-tests/micrometer-prometheus/pom.xml
index cb506429291cb..1dcda8fc1333f 100644
--- a/integration-tests/micrometer-prometheus/pom.xml
+++ b/integration-tests/micrometer-prometheus/pom.xml
@@ -17,7 +17,6 @@
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- Hibernate -->

From 8a5f9cf0af15d181d69fe9787989eca91c91506b Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 17 Nov 2022 10:46:03 +0100
Subject: [PATCH 2/3] Disable MailerTest fully on macOS as just disabling 1
 test doesn't work

---
 .../mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java
index afaaf340f46cb..1c782ca918767 100644
--- a/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java
+++ b/integration-tests/mailer/src/test/java/io/quarkus/it/mailer/MailerTest.java
@@ -19,7 +19,7 @@
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 
-@DisabledOnOs(OS.WINDOWS)
+@DisabledOnOs({ OS.WINDOWS, OS.MAC })
 @QuarkusTest
 @QuarkusTestResource(FakeMailerTestResource.class)
 public class MailerTest {
@@ -112,7 +112,6 @@ public void sendEmailToMultipleRecipients() {
     }
 
     @Test
-    @DisabledOnOs(OS.MAC)
     public void sendHtmlEmail() {
         RestAssured.get("/mail/html");
 

From ee4b274d3905bc7739261d2ce8a0fc40c76f52be Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Thu, 17 Nov 2022 10:46:33 +0100
Subject: [PATCH 3/3] Disable Kubernetes dev services for
 integration-tests/micrometer-prometheus

We cannot start a Docker container on Windows.
---
 .../src/main/resources/application.properties                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/integration-tests/micrometer-prometheus/src/main/resources/application.properties b/integration-tests/micrometer-prometheus/src/main/resources/application.properties
index 2e8a6545ab167..855e6fcbbe7c3 100644
--- a/integration-tests/micrometer-prometheus/src/main/resources/application.properties
+++ b/integration-tests/micrometer-prometheus/src/main/resources/application.properties
@@ -25,3 +25,6 @@ quarkus.rest-client.pingpong.url=${test.url}
 quarkus.rest-client.read-timeout=1000
 
 deployment.env=test
+
+# Disable Kubernetes dev services as not supported on Windows
+quarkus.kubernetes-client.devservices.enabled=false