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.

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

Split the Wildfy/EAP Maven plugin configuration (from G:A:V to manifest artifact) #126

Merged

Conversation

fabiobrz
Copy link
Member

@fabiobrz fabiobrz commented Dec 19, 2023

Description

This PPR is a follow up to #121

The required WildFly/EAP 8 Maven plugin configuration needs channel manifest, and this must be reflected by configutration properties.

The PR also refactors the location of such aplication deployments properties so that it's now more straightforward and easy to use.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • Feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change
  • Chore (non-breaking change which doesn't affect codebase;
    test, version modification, documentation, etc.)

Checklist

  • Code contributed by me aligns with current project license: Apache 2.0
  • Pull Request contains a description of the changes
  • Pull Request does not include fixes for multiple issues/topics
  • Code is self-descriptive and/or documented
  • I have implemented unit tests to cover my changes
  • I tested my code in OpenShift

@fabiobrz fabiobrz force-pushed the split-wildfly-eap-channel-config branch from dae6035 to bf6ab68 Compare December 20, 2023 09:19
Copy link
Collaborator

@tommaso-borgato tommaso-borgato left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fabiobrz LGTM, even though parameters were already split, this is a nice refactoring on how to pick them up with defaults methods instead of overriding them each time...

String WILDFLY_CLOUD_FEATURE_PACK_LOCATION = "wildfly.cloud-feature-pack.location";
String WILDFLY_EE_CHANNEL_GROUPID = "wildfly.ee-channel.groupId";
String WILDFLY_EE_CHANNEL_ARTIFACTID = "wildfly.ee-channel.artifactId";
String WILDFLY_EE_CHANNEL_VERSION = "wildfly.ee-channel.version";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

perfectly aligned with CI where, on invocation, the TESTED_WILDFLY_EAP8_EE_CHANNEL_MANIFEST is splitted:

# e.g. org.jboss.eap.channels:eap-8.0:1.0.1.GA-redhat-20231212
if [[ "x" != "x$TESTED_WILDFLY_EAP8_EE_CHANNEL_MANIFEST" ]]; then
  arrWfChannelManifestGav=(${TESTED_WILDFLY_EAP8_EE_CHANNEL_MANIFEST//:/ })
  if [[ "x" == "x${arrWfChannelManifestGav[0]}" ]] || [[ "x" == "x${arrWfChannelManifestGav[1]}" ]] || [[ "x" == "x${arrWfChannelManifestGav[2]}" ]]; then
    echo "[ERROR] Invalid value for parameter TESTED_WILDFLY_EAP8_EE_CHANNEL_MANIFEST=$TESTED_WILDFLY_EAP8_EE_CHANNEL_MANIFEST"
    exit 1
  fi
  if [[ ! $ADDITIONAL_MAVEN_ARGS =~ '-Dwildfly.ee-channel.groupId=' ]]; then
    ADDITIONAL_MAVEN_ARGS="$ADDITIONAL_MAVEN_ARGS -Dwildfly.ee-channel.groupId=${arrWfChannelManifestGav[0]}"
  fi
  if [[ ! $ADDITIONAL_MAVEN_ARGS =~ '-Dwildfly.ee-channel.artifactId=' ]]; then
    ADDITIONAL_MAVEN_ARGS="$ADDITIONAL_MAVEN_ARGS -Dwildfly.ee-channel.artifactId=${arrWfChannelManifestGav[1]}"
  fi
  if [[ ! $ADDITIONAL_MAVEN_ARGS =~ '-Dwildfly.ee-channel.version=' ]]; then
    ADDITIONAL_MAVEN_ARGS="$ADDITIONAL_MAVEN_ARGS -Dwildfly.ee-channel.version=${arrWfChannelManifestGav[2]}"
  fi
fi

@fabiobrz
Copy link
Member Author

/retest

@tommaso-borgato tommaso-borgato merged commit 91c068f into Intersmash:main Dec 22, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants