Various OtherBranchVersionExtension fixes #128
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…found when a project using gitflow-helper-maven-plugin is loaded into IntelliJ: 1) Added a condition to *not* activate the OtherBranchVersionExtension, when the project file is pom-gitflow-massaged.xml . For unclear reasons, at times, IntelliJ's Maven integration tries to interpret the massaged pom file as well 2) When only a subtree of a multi-module project is build, the embedded Maven execution now always loads the *conventional* location of the project file, rather than relying on the file location already loaded. This was needed as there are cases when running in the context of IntelliJ Maven integration findTopLevelProject() produces a project referencing a massaged pom file. 3) Only write the massaged pom file if the model contents would change. This was done as tools like IntelliJ would otherwise see continuous file changes, which are used as trigger to synchronize. The approach implemented is able to deal with a subtle pom file change since Maven 3.6.3, where the schema location was changed towards https). 4) Only update the model and produce the pom-gitflow-massaged.xml file for projects *inside* the reactor. Before when executing in a subtree of a multi-module project, it would update the project model for *all* modules in the multi-module project. This was especially problematic in conjunction with IntelliJ's Maven integration, which processes each module individually, and would trigger the pom-gitflow-massaged.xml for each module to be updated times the number of modules in the multi-module project; very inefficient Consequence of IntelliJ's Maven integration before this update, is that it could also result in incorrect pom-gitflow-massaged.xml which would end-up in your local repository, and could result in build failures for dependent projects.
|
In addition to the functional changes, I took the liberty to breakup the original afterProjectsRead function, as it had gotten quite big/nested, which made it hard to read. I also added two integration tests that cover the additional features implemented. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed a number of issues related to the OtherBranchVersionExtension, found when a project using gitflow-helper-maven-plugin is loaded into IntelliJ:
Consequence of IntelliJ's Maven integration before this update, is that it could also result in incorrect pom-gitflow-massaged.xml which would end-up in your local repository, and could result in build failures for dependent projects.