Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[issues-207] - Fix how Maven additioanl args for s2i OpenSHift builds are built by WildFly related application descriptors #211

Merged
merged 1 commit into from
Jan 9, 2025
Merged

[issues-207] - Fix how Maven additioanl args for s2i OpenSHift builds are built by WildFly related application descriptors #211

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/**
Expand Down Expand Up @@ -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() + "="
Expand Down
Loading