From 2b73c943881330eb223a3fe69be4471ffee509b2 Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Wed, 31 Jan 2024 10:40:49 +0100
Subject: [PATCH] chore: Fix YAKS tests for 4.4.0-SNAPSHOT

- Update Apache Camel runtime to 4.4.0-SNAPSHOT
- Use CitrusObjectFactory instead of CitrusSpringObjectFactory as the latter one has open issues
---
 tests/camel-kamelets-itest/pom.xml                           | 2 +-
 tests/camel-kamelets-itest/src/test/java/KameletsYaksIT.java | 5 -----
 .../src/test/resources/citrus-application.properties         | 2 +-
 .../src/test/resources/cucumber.properties                   | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/tests/camel-kamelets-itest/pom.xml b/tests/camel-kamelets-itest/pom.xml
index 8158138cf..2079a00fa 100644
--- a/tests/camel-kamelets-itest/pom.xml
+++ b/tests/camel-kamelets-itest/pom.xml
@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-spring</artifactId>
+            <artifactId>cucumber-java</artifactId>
             <version>${cucumber.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/tests/camel-kamelets-itest/src/test/java/KameletsYaksIT.java b/tests/camel-kamelets-itest/src/test/java/KameletsYaksIT.java
index deb5875bb..50b80bb09 100644
--- a/tests/camel-kamelets-itest/src/test/java/KameletsYaksIT.java
+++ b/tests/camel-kamelets-itest/src/test/java/KameletsYaksIT.java
@@ -17,13 +17,8 @@
 
 import io.cucumber.junit.Cucumber;
 import io.cucumber.junit.CucumberOptions;
-import io.cucumber.spring.CucumberContextConfiguration;
-import org.citrusframework.config.CitrusSpringConfig;
 import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
 
-@CucumberContextConfiguration
-@ContextConfiguration(classes = CitrusSpringConfig.class)
 @RunWith(Cucumber.class)
 @CucumberOptions(
         extraGlue = "org.citrusframework.yaks",
diff --git a/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties b/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
index b4e369489..19991c7c8 100644
--- a/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
+++ b/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties
@@ -8,7 +8,7 @@ citrus.type.converter=camel
 yaks.cluster.type=local
 yaks.camelk.max.attempts=10
 
-yaks.jbang.camel.version=4.3.0
+yaks.jbang.camel.version=4.4.0-SNAPSHOT
 yaks.jbang.kamelets.version=4.4.0-SNAPSHOT
 
 yaks.jbang.kamelets.local.dir=../../../kamelets
diff --git a/tests/camel-kamelets-itest/src/test/resources/cucumber.properties b/tests/camel-kamelets-itest/src/test/resources/cucumber.properties
index 4a022c942..91707f3cd 100644
--- a/tests/camel-kamelets-itest/src/test/resources/cucumber.properties
+++ b/tests/camel-kamelets-itest/src/test/resources/cucumber.properties
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-cucumber.object-factory=org.citrusframework.cucumber.backend.spring.CitrusSpringObjectFactory
+cucumber.object-factory=org.citrusframework.cucumber.backend.CitrusObjectFactory
 cucumber.publish.quiet=true
 
 cucumber.filter.tags=not @ignored and not @knative