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() + "="