Feature/other branch reversioning extension #124
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
…oyment branches
* Pull up branch detection and plugin config extraction from the MasterPromotExtension to AbstractBranchDetectingExtension.
* Introduce OtherBranchVersionExtension, responsible for updating project versions based on the 'otherBranchDeploymentPattern'.
* Updates project versions of MavenProjects in the reactor.
* Parent references in the reactor model are by reference, so we don't have to update 'parent' relations on projects.
* Iterates all reactor projects to update any (managed)dependencies or (managed)plugins.
* Removed artifact version manipulation from the RetargetDeployMojo -- which no longer needs to do that.
* Introduced basic multi-module IT stub.
* Parent pom
* Child modules with a dependency (Child2 -> depends upon -> Child1)
Notes:
* Still missing automated ITs on this - I was making this a 'poc' to see if it was feasible before I started writing exhaustive test cases.
* mvn initialize will fail for update-stage-dependencies on child2, however mvn package will succeed.
* The lack of a resolvable dependency in the reactor, or in the remote stage repo keeps update-stage-dependencies from succeeding.
* When the jar is built as part of the reactor, it finds the dep in the current reactor just fine. This is... wonky.
* I have not checked the output pom.xml's in the target to determine if their versions are being written based on the updates from the extension.
* Adjusts the artifact versions for the default project artifact.
* Other artifacts attached by the build use these versions as the basis.
* Massage both effective in-memory models and original model (unalterd POM) of the project. * Update project state (and hierarchy of projects) whereever possible. * Retarget Deploy is really simple now. :-) * Updates the OtherBranchVersionExtension to handle project massaging and emission of the massaged pom. * The normal ProjectDeployer from maven-artifact-transfer works quite will with this POM swapping.
…erBranchVersionExtension
…ies from the main session to the nested maven execution
…e other branch suffix being applied to a version repeatedly (+normalized-branch-name+normalized-branch-name-SNAPSHOT)
…om:rdefreitas/gitflow-helper-maven-plugin into feature/partial-multi-module-reversioning
… execution. This is due to that additional execution clearing a ThreadLocal reference to the Session, that subsequent plugins/code may depend on (ie IntelliJ's Maven integration).
…e nested Maven execution. Changed from creating one from scratch, towards basing it on the request from the session, copying it, removing unneeded aspect and changing others.
…anch-renaming Prevent repeated OtherBranch name suffixes being appended
…-reversioning Extended the OtherBranchVersionExtension to deal with partial multi-module builds
Pull Request Test Coverage Report for Build 440
💛 - Coveralls |
|
Thank you @bvarner for picking this up and incorporating this into the master branch! |
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.
Addresses #105 .
Major thanks to all the contributors on this branch!