Skip to content

chore: merge model parents and disconnect it from build parent#2323

Merged
rsynek merged 10 commits into
TimefoldAI:mainfrom
rsynek:fix/fix-model-parent
Jun 2, 2026
Merged

chore: merge model parents and disconnect it from build parent#2323
rsynek merged 10 commits into
TimefoldAI:mainfrom
rsynek:fix/fix-model-parent

Conversation

@rsynek

@rsynek rsynek commented May 29, 2026

Copy link
Copy Markdown
Collaborator

Notable changes:

  • merged the model-base-parent and model-parent as the idea of layered models is no longer relevant
  • disconnected the model-parent from build-parent to avoid solver build process impact models
  • added some forgotten dependency renames in the enterprise profile

@rsynek rsynek requested a review from winklerm May 29, 2026 13:03
@rsynek rsynek requested a review from triceo as a code owner May 29, 2026 13:03
Copilot AI review requested due to automatic review settings May 29, 2026 13:03

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

This PR simplifies the model build by removing the layered “base parent” POM, folding its responsibilities into model-parent, and decoupling model-parent from the solver build parent to avoid cross-build side effects, while also updating renamed Enterprise dependencies.

Changes:

  • Removed the model-base-parent module from the model reactor and deleted its POM.
  • Made timefold-solver-model-parent standalone (no parent), adding its own key version/properties and BOM imports.
  • Updated Enterprise profile dependency/artifactId renames and added Enterprise BOM import/repository wiring.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
model/pom.xml Removes facade/model-base-parent from the module list to reflect the parent POM merge.
model/facade/model-parent/pom.xml Converts the model parent into a standalone parent POM, adds version management/BOM imports, and updates Enterprise profile dependencies.
model/facade/model-base-parent/pom.xml Deletes the now-obsolete base parent POM after consolidation.

Comment thread model/facade/model-parent/pom.xml
@rsynek rsynek force-pushed the fix/fix-model-parent branch from 94ffa78 to 0aac227 Compare May 29, 2026 13:17

@winklerm winklerm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks, the changes look good to me!

I have left a question and one concern about the flatten plugin, which I find potentially problematic, but I do not have any proof that it will not work without it, so leaving that up to your judgment.

Comment thread model/facade/model-parent/pom.xml
Comment thread model/facade/model-parent/pom.xml Outdated
Comment thread model/facade/model-parent/pom.xml
Comment thread model/facade/model-parent/pom.xml Outdated
Copilot AI review requested due to automatic review settings June 2, 2026 10:07
rsynek added 2 commits June 2, 2026 12:07
Most plugins should have been defined in pluginManagement only.
Added the flatten-maven-plugin to make sure the revision property does not propagate from models.

@winklerm winklerm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thank you! One more question inline, otherwise looks good to me!

Comment thread model/facade/model-parent/pom.xml Outdated

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

Comment thread model/facade/model-parent/pom.xml
Comment thread model/facade/model-parent/pom.xml
Copilot AI review requested due to automatic review settings June 2, 2026 10:19

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Comment thread model/facade/model-parent/pom.xml
Copilot AI review requested due to automatic review settings June 2, 2026 10:36

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

Comment thread model/facade/model-parent/pom.xml
Comment thread model/facade/model-parent/pom.xml
Comment thread model/facade/model-parent/pom.xml
@sonarqubecloud

sonarqubecloud Bot commented Jun 2, 2026

Copy link
Copy Markdown

@triceo triceo left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Small comment; LGTM when resolved.

Comment thread model/facade/model-parent/pom.xml Outdated
Copilot AI review requested due to automatic review settings June 2, 2026 12:24
@rsynek rsynek merged commit 42bce4e into TimefoldAI:main Jun 2, 2026
14 of 15 checks passed

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Comment on lines 26 to 28
<!--suppress UnresolvedMavenProperty -->
<ai.timefold.platform.model.test.api-key>${env.TF_PLATFORM_TEST_API_KEY}</ai.timefold.platform.model.test.api-key>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
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.

4 participants