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

maven-parent: Copy locally defined OMODs #46

Merged
merged 4 commits into from
Feb 16, 2024

Conversation

ibacher
Copy link
Contributor

@ibacher ibacher commented Feb 13, 2024

The main goal of this PR is to enable copying any OMOD dependencies into to the OpenMRS modules directory. This is done using the same pattern as Ozone. I've also update the distribution itself to delete any non-OMOD JARs that are accidentally included by deleting them.

@ibacher
Copy link
Contributor Author

ibacher commented Feb 13, 2024

cc: @rbuisson @Ruhanga @corneliouzbett I'd appreciate your reviews on this.

@rbuisson
Copy link
Contributor

@ibacher , @corneliouzbett had done this in order to account for the issue of not copying non-omod dependencies. In that instance, excluding the Camel routes. Doesn't it suffice? Or do you anticipate possible other non-omods deps that should be removed?

@ibacher
Copy link
Contributor Author

ibacher commented Feb 14, 2024

Or do you anticipate possible other non-omods deps that should be removed?

I think it suffices for Ozone itself—and is actually a better solution than what I've implemented here. I was sort of anticipating "what happens if an Ozone FOSS user implements their own eip", but maybe that's not something we need to anticipate?

@rbuisson
Copy link
Contributor

Well, fair enough. We might as well go for a solution that's generic enough.
Please remove the exclusion of com.ozone artifacts and go for the removal of anything that's been copied but is not an OMOD.

cc @corneliouzbett .

Copy link
Contributor

@Ruhanga Ruhanga left a comment

Choose a reason for hiding this comment

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

@ibacher
Copy link
Contributor Author

ibacher commented Feb 15, 2024

@Ruhanga I guess so, but it's harmless since I added a delete step to delete those files anyways.

@rbuisson
Copy link
Contributor

@ibacher could you take a look at those conflicts? Then we can merge.

@ibacher
Copy link
Contributor Author

ibacher commented Feb 16, 2024

I was just working on resolving them. I think we should be good.

@rbuisson rbuisson merged commit ffde3dd into ozone-his:main Feb 16, 2024
1 check failed
@ibacher ibacher deleted the maven-parent-handle-omods branch February 20, 2024 13:03
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.

3 participants