SNOMED International Mapping Tool

Space shortcuts

Child pages
  • Versioning "develop" and "master"

Versions Compared

Old Version 8

changes.mady.by.user Rick Wood

Saved on

compared with

New Version 9

changes.mady.by.user Rick Wood

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

NOTE: Confirm that pom-us.xml also gets versioned appropriately.  If not, updated update manually.

NOTE: you may notice the complexity of running versions:set twice.  This is because of the split nature of the parent and aggregator modules.  It is recommended in the future that parent project be merged into the aggregator and removed.  Thant involves:

...

Occasionally, only a select few commits from develop need to be deployed on production as a hotfix.  In these cases, the full merging from develop to master is inappropriate, and the following steps should be followed instead:

  1. Switch to the "master" branch.
  2. Use CherryPick in TortoiseGit to merge the desired commit(s) from develop into master:
    1. Using TortoiseGit, select Show Log.  
    2. In the top left-hand corner there will be a hyperlink saying "master".  Hit that to open a dialog box showing other branches, and select the "develop" branch.
    3. Select the commit(s) to be included in the hotfix, right-click, and choose "Cherry pick this commit".  Follow the prompts to in the next screen to merge this/these commits into master.

  3. Use "mvn versions:set" to change the versions of the master branch.  For hotfixes, the convention is to add an underscore+letter to the current version.  e.g. If the current version is 1.5.2, then update the version to 1.5.2_a.  If another hotfix is deployed before the next full merge from develop into master, increment the letter to 1.5.2_b, and so on.

    Code Block
    cd /path/to/OTF-Mapping-Service
mvn versions:set
... when prompted, type in the version plus the hotfix suffix (e.g. 1.5.2_a)
cd parent/
mvn versions:set
... when prompted type in the version plus the hotfix suffix (e.g. 1.5.2_a)
 
... Note: If you make a mistake, use mvn versions:revert.


  4. Commit the "master" branch changes and push.

NOTE: For hotfixes, no version changing is done on the develop branch. So in the above example, the develop version will remain at "1.5.2-SNAPSHOT".

NOTE: As with standard merges, confirm that pom-us.xml also gets versioned appropriately.  If not, update manually.

  • n/a