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

[issue 113] - Refactor deployments, tools and remove legacy name identifiers #129

Merged
merged 9 commits into from
Jan 22, 2024

Conversation

fabiobrz
Copy link
Member

@fabiobrz fabiobrz commented Jan 9, 2024

Description

  • Refactoring deployments, they are testsuite stuff, so moved there
  • Refactoring tools, now core and provisioners are top level
  • As for the EAP 7 Hello World example, the legacy WildFly Bootable JAR deployment should only be built and tested for the product, i.e. EAP 7, and not being used to verify the newer WildFly versions.
  • Fixed, removed some wrong, although working, configurations

Fix #113

Note for reviewer(s)
A lot of files have been changed but don't be scared, this PR is basically and mostly about renaming files. Just a few minor changes have been added to those, but here's a per-commit recap to make your work quicker:

1. Mainly renaming files.
A POM configuration has been added since it was missing in the EAP logic so far. Code cleaning.
2. Fixing WIldFLy/EAP XP BOMs definitions
3. BIG move
Basically moved files + consequent package name refactoring affecting imports + CI update
testsuite modles split in deployments + integration-tests.
Renamed demos to examples as well (sorry)
BTW broken commit containing an unresolved conflict
4. Just fixing examples modules imports
5. BIG move
Basically moved files + consequent package name refactoring affecting imports + CI update
6. Fixing the Bootable JAR plugin configuration after moving core and provisioners up, and removing a redundant lombok dep
7. Fixing the CI scripts again and a SPI registration file containing a wrong package
8. Renaming the profile for configuring the excluded tests depending on TS execution target (community/prod)
Renaming the profile for configuring the excluded tests depending on wildfly/eap target version (eap/eapxp)
9. the e2e scripts need to set intersmash.deployments.repository.urland intersmash.deployments.repository.ref to those of the PR, otherwise deployments are cloned from the Intersmash repo itself, and this doesn't work when modifying a deployment.

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 (but we're not breaking APIs since we haven't released yet)
  • 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 move-javax-dep-to-eap7 branch 2 times, most recently from 0618584 to f926046 Compare January 11, 2024 17:54
@fabiobrz fabiobrz changed the title [issue 113] - Renaming/refactoring the legacy WildFly Bootable JAR deployment to only support product (EAP 7) [issue 113] - Refactor deployments, tools and remove legacy name identifiers Jan 15, 2024
@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch 2 times, most recently from 21bc635 to 127bd62 Compare January 15, 2024 23:00
@fabiobrz
Copy link
Member Author

/retest

1 similar comment
@fabiobrz
Copy link
Member Author

/retest

@fabiobrz fabiobrz marked this pull request as draft January 16, 2024 10:12
@fabiobrz fabiobrz marked this pull request as ready for review January 16, 2024 10:48
@fabiobrz fabiobrz closed this Jan 16, 2024
@fabiobrz fabiobrz reopened this Jan 16, 2024
@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch from 5fdfe98 to c3ee0ce Compare January 17, 2024 15:55
@fabiobrz fabiobrz marked this pull request as draft January 18, 2024 10:10
@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch 2 times, most recently from 0ec4e58 to 44c5656 Compare January 18, 2024 17:00
@fabiobrz fabiobrz marked this pull request as ready for review January 18, 2024 17:06
@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch 2 times, most recently from 0b34ea9 to 01616b0 Compare January 18, 2024 21:07
@marekkopecky
Copy link
Collaborator

AFAICS <version.wildfly-jar-maven-plugin> property is defined in 4 places to 10.0.0.Final and on 1 place to 6.1.3.Final-redhat-00001. Would be possible to define one default value to 10.0.0.Final and just replace it once to 6.1.3.Final-redhat-00001?

@marekkopecky
Copy link
Collaborator

marekkopecky commented Jan 19, 2024

I go through the current commits and just find a few minor issues. Please also let me know once CI would be fixed or share some details about the test errors. Thank you for this MR!

@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch from 01616b0 to 76ad573 Compare January 19, 2024 11:06
…ployment to only support product (EAP 7).

Renaming/refactoring tests components that are related to the EAP 7 Bootable JAR provisioning
@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch from 76ad573 to 0dcb844 Compare January 19, 2024 11:12
@fabiobrz
Copy link
Member Author

AFAICS <version.wildfly-jar-maven-plugin> property is defined in 4 places to 10.0.0.Final and on 1 place to 6.1.3.Final-redhat-00001. Would be possible to define one default value to 10.0.0.Final and just replace it once to 6.1.3.Final-redhat-00001?

Thanks @marekkopecky - I removed one of them which was redundant. The others are meant to be there for the following reasons:

  1. examples are basically not depending on one another, hence each of them could use a different version
  2. the root POM should not have such a property which is only relevant in the testsuite or examples contexts

@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch from 0dcb844 to 9ac515e Compare January 19, 2024 11:15
@fabiobrz
Copy link
Member Author

I go through the current commits and just find a few minor issues. Please also let me know once CI would be fixed or share some details about the test errors. Thank you for this MR!

Thanks a lot for your review @marekkopecky - let's see whether the last run fixes the only failure (which I was not able to reproduce at first attempt locally), otherwise I'll try and work on it it later or on Monday.

@marekkopecky
Copy link
Collaborator

  1. examples are basically not depending on one another, hence each of them could use a different version

Yes, this is true. Theoretically we could probably have one example for WF and second one for EAP, so there might be a need for this. This said, the versions are the same now in both examples. Let's keep it as it is, but if we find out that there won't be any need for different versions, we can move the version property to examples/pom.xml

@fabiobrz
Copy link
Member Author

/retest

@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch 2 times, most recently from 6dae517 to 71dade1 Compare January 19, 2024 19:27
@fabiobrz fabiobrz force-pushed the move-javax-dep-to-eap7 branch from 71dade1 to 00ac6ee Compare January 21, 2024 14:25
@fabiobrz
Copy link
Member Author

fabiobrz commented Jan 21, 2024

I go through the current commits and just find a few minor issues. Please also let me know once CI would be fixed or share some details about the test errors. Thank you for this MR!

Hi @marekkopecky - I fixed the last tests and CI checks are green now. Let me know whether you think there's something else we'd want to do here.

@marekkopecky marekkopecky merged commit df23894 into Intersmash:main Jan 22, 2024
3 checks passed
@marekkopecky
Copy link
Collaborator

Thank you! PR merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Refactor (rename symbols, packages, move files etc.) to prepare for first release
2 participants