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

Feature/other branch reversioning extension #126

Merged
merged 19 commits into from
Jan 14, 2021

Commits on Dec 23, 2019

  1. feat: Initial work on an extension to set version info for other depl…

    …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.
    bvarner committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    7c65a36 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d25c854 View commit details
    Browse the repository at this point in the history
  3. * Adjust build final names, incase they include the version.

    * Adjusts the artifact versions for the default project artifact.
        * Other artifacts attached by the build use these versions as the basis.
    bvarner committed Dec 23, 2019
    Configuration menu
    Copy the full SHA
    815d102 View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2019

  1. feat: Massaging of version information within reactor POMs.

    * 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.
    bvarner committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    7cd44ec View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. Configuration menu
    Copy the full SHA
    5aedf12 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    877f841 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2020

  1. Added support for dealing with partial multi-module builds in the Oth…

    …erBranchVersionExtension
    glimmerveen committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    c60b5c2 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2020

  1. Copied the mirrors, remote repositories and plugin artifact repositor…

    …ies from the main session to the nested maven execution
    glimmerveen committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    959b269 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2020

  1. Configuration menu
    Copy the full SHA
    264c0b4 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2020

  1. fix an issue wherein certain plugin execution orders could lead to th…

    …e other branch suffix being applied to a version repeatedly (+normalized-branch-name+normalized-branch-name-SNAPSHOT)
    Ron DeFreitas committed Oct 2, 2020
    Configuration menu
    Copy the full SHA
    2cb2c77 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2020

  1. add unit test to cover branch renaming

    Ron DeFreitas committed Oct 5, 2020
    Configuration menu
    Copy the full SHA
    a79b41e View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2020

  1. Merge branch 'feature/fix-repeated-other-branch-renaming' of github.c…

    …om:rdefreitas/gitflow-helper-maven-plugin into feature/partial-multi-module-reversioning
    glimmerveen committed Oct 7, 2020
    Configuration menu
    Copy the full SHA
    9d1c277 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. Bump junit from 4.8.2 to 4.13.1

    Bumps [junit](https://github.com/junit-team/junit4) from 4.8.2 to 4.13.1.
    - [Release notes](https://github.com/junit-team/junit4/releases)
    - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
    - [Commits](junit-team/junit4@r4.8.2...r4.13.1)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] committed Oct 13, 2020
    Configuration menu
    Copy the full SHA
    2ee35eb View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2020

  1. Restore Session in LegacySupport *after* running the additional Maven…

    … 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).
    glimmerveen committed Nov 23, 2020
    Configuration menu
    Copy the full SHA
    c2db550 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2020

  1. Changed approach on how to construct the MavenExecutionRequest for th…

    …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.
    glimmerveen committed Nov 26, 2020
    Configuration menu
    Copy the full SHA
    b30df68 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2021

  1. Merge pull request #122 from rdefreitas/feature/fix-repeated-other-br…

    …anch-renaming
    
    Prevent repeated OtherBranch name suffixes being appended
    bvarner committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    9889c7f View commit details
    Browse the repository at this point in the history
  2. Merge pull request #120 from glimmerveen/feature/partial-multi-module…

    …-reversioning
    
    Extended the OtherBranchVersionExtension to deal with partial multi-module builds
    bvarner committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    13fcbaf View commit details
    Browse the repository at this point in the history
  3. Merge pull request #123 from egineering-llc/dependabot/maven/junit-ju…

    …nit-4.13.1
    
    Bump junit from 4.8.2 to 4.13.1
    bvarner committed Jan 14, 2021
    Configuration menu
    Copy the full SHA
    3a09f95 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1261c44 View commit details
    Browse the repository at this point in the history