From f496102585e1e25a32b9ed7f9a99700a95689478 Mon Sep 17 00:00:00 2001
From: Fedor Dudinsky <fdudinsk@redhat.com>
Date: Wed, 2 Oct 2024 11:09:22 +0200
Subject: [PATCH] Enable funqy tests in Native

Following the recommendation from https://github.com/quarkusio/quarkus/issues/43360

(cherry picked from commit 64f9986ab5bc82b717f929593131f604b78dbe93)
---
 funqy/knative-events/pom.xml                  | 24 ++-----------------
 .../funqy/knativeevents/FunqyKnEventsIT.java  |  2 --
 ...lessExtensionOpenShiftFunqyKnEventsIT.java |  2 --
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/funqy/knative-events/pom.xml b/funqy/knative-events/pom.xml
index 125e26914..72f5d6fa5 100644
--- a/funqy/knative-events/pom.xml
+++ b/funqy/knative-events/pom.xml
@@ -28,12 +28,8 @@
             <artifactId>quarkus-openshift</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>openshift-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>knative-client</artifactId>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-openshift-client</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus.qe</groupId>
@@ -51,20 +47,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <!-- Disable native build on this module -->
-            <!--TODO https://github.com/quarkusio/quarkus/issues/43360 -->
-            <id>native</id>
-            <activation>
-                <property>
-                    <name>native</name>
-                </property>
-            </activation>
-            <properties>
-                <!-- To not build the module on Native -->
-                <quarkus.build.skip>true</quarkus.build.skip>
-            </properties>
-        </profile>
-    </profiles>
 </project>
diff --git a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/FunqyKnEventsIT.java b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/FunqyKnEventsIT.java
index 40e849796..82473bfc5 100644
--- a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/FunqyKnEventsIT.java
+++ b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/FunqyKnEventsIT.java
@@ -16,12 +16,10 @@
 
 import io.quarkus.test.bootstrap.RestService;
 import io.quarkus.test.scenarios.QuarkusScenario;
-import io.quarkus.test.scenarios.annotations.DisabledOnNative;
 import io.quarkus.test.services.QuarkusApplication;
 import io.restassured.RestAssured;
 
 @QuarkusScenario
-@DisabledOnNative(reason = "https://github.com/quarkusio/quarkus/issues/43360")
 public class FunqyKnEventsIT {
 
     @QuarkusApplication
diff --git a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java
index dd434cff9..c71566e1b 100644
--- a/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java
+++ b/funqy/knative-events/src/test/java/io/quarkus/ts/funqy/knativeevents/ServerlessExtensionOpenShiftFunqyKnEventsIT.java
@@ -20,14 +20,12 @@
 
 import io.quarkus.test.scenarios.OpenShiftDeploymentStrategy;
 import io.quarkus.test.scenarios.OpenShiftScenario;
-import io.quarkus.test.scenarios.annotations.DisabledOnNative;
 import io.quarkus.test.services.QuarkusApplication;
 import io.quarkus.test.services.knative.eventing.FunqyKnativeEventsService;
 import io.quarkus.test.services.knative.eventing.OpenShiftExtensionFunqyKnativeEventsService;
 import io.quarkus.test.services.knative.eventing.spi.ForwardResponseDTO;
 import io.restassured.common.mapper.TypeRef;
 
-@DisabledOnNative(reason = "https://github.com/quarkusio/quarkus/issues/43360")
 @Tag("use-quarkus-openshift-extension")
 @Tag("serverless")
 @OpenShiftScenario(deployment = OpenShiftDeploymentStrategy.UsingOpenShiftExtension)