Skip to content

server build does not need separate flow engine jar#846

Merged
labkey-matthewb merged 4 commits intodevelopfrom
fb_flow_engine
Feb 26, 2025
Merged

server build does not need separate flow engine jar#846
labkey-matthewb merged 4 commits intodevelopfrom
fb_flow_engine

Conversation

@labkey-matthewb
Copy link
Contributor

Rationale

Do we need to do anything to the code that validates version numbers?

Related Pull Requests

Changes

project.tasks.named('assemble').configure { dependsOn(project.tasks.engineJar) }
project.tasks.named('module').configure { dependsOn(project.tasks.engineJar) }

// The server build does not need flow_engine.jar
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it does actually need the engineJar, as currently assembled. When I tried to simply remove this before, I found that the module code references some classes that are in the engine. That could could possibly be moved to the API jar for this module, but I don't know enough about the workings here to say anything with confidence.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, I ran the flow tests after deleting the jar and I think it worked fine... I'll check again.

Copy link
Contributor

Choose a reason for hiding this comment

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

TeamCity is definitely not happy, though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thank you for the help!

@labkey-matthewb labkey-matthewb changed the title server build does not need flow engine server build does not need separate flow engine jar Feb 26, 2025
Copy link
Contributor

@labkey-susanh labkey-susanh left a comment

Choose a reason for hiding this comment

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

I think you probably want to remove this line from the engineJar task configuration:

jar.destinationDirectory.set(project.file(project.labkey.explodedModuleLibDir))

The default destination directory is build/modules/flow/libs, which seems a more natural place to find the jar if it's going to be used outside the module. If the engine jar is in the explodedModule/lib directory, it will be included when the module is built and we could still have a dependency version problem when the version changes (less likely since the jar won't always be present, but still annoying if it happens).

labkey-matthewb and others added 2 commits February 26, 2025 08:48
Co-authored-by: Susan Hert <susanh@labkey.com>
@labkey-matthewb labkey-matthewb merged commit feeff42 into develop Feb 26, 2025
3 checks passed
@labkey-matthewb labkey-matthewb deleted the fb_flow_engine branch February 26, 2025 18:58
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.

2 participants