From 5e8af0743726a67c4b5184c813a9fd65b4c53a8c Mon Sep 17 00:00:00 2001
From: Fabio Burzigotti <fburzigo@redhat.com>
Date: Mon, 25 Nov 2024 11:02:31 +0100
Subject: [PATCH] [issues-207] - Fix WildflyDeploymentApplicationConfiguration,
 which is building Maven additional args wrongly in
 generateAdditionalMavenArgs

---
 .../WildflyDeploymentApplicationConfiguration.java  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java b/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java
index 10cce3d5..51cc5df5 100644
--- a/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java
+++ b/testsuite/deployments/deployments-provider/src/main/java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java
@@ -101,13 +101,22 @@ default String bomsEeServerVersionPropertyName() {
 		return WILDFLY_BOMS_EE_SERVER_VERSION;
 	}
 
+	/**
+	 * This must match the property name in the pom.xml file used to set the "wildfly-galleon-pack" feature pack GAV
+	 *
+	 * @return property name in the pom.xml file used to set the feature pack GAV
+	 */
+	default String featurePackLocationPropertyName() {
+		return WILDFLY_FEATURE_PACK_LOCATION;
+	}
+
 	/**
 	 * This must match the property name in the pom.xml file used to set the "wildfly-ee-galleon-pack" feature pack GAV
 	 *
 	 * @return property name in the pom.xml file used to set the feature pack GAV
 	 */
 	default String eeFeaturePackLocationPropertyName() {
-		return WILDFLY_FEATURE_PACK_LOCATION;
+		return WILDFLY_EE_FEATURE_PACK_LOCATION;
 	}
 
 	/**
@@ -206,7 +215,7 @@ default String generateAdditionalMavenArgs() {
 				: (" -D" + this.eeFeaturePackLocationPropertyName() + "="
 						+ this.eeFeaturePackLocation())))
 				+ ((Strings.isNullOrEmpty(this.featurePackLocation()) ? ""
-						: (" -D" + this.featurePackLocation() + "="
+						: (" -D" + this.featurePackLocationPropertyName() + "="
 								+ this.featurePackLocation())))
 				+ ((Strings.isNullOrEmpty(this.cloudFeaturePackLocation()) ? ""
 						: (" -D" + this.cloudFeaturePackLocationPropertyName() + "="