[MGNLEE-362] Merge enterprise module into ee-bundle Git repo and Maven reactor Created: 28/May/14  Updated: 10/Mar/17  Resolved: 30/May/14

Status: Closed
Project: Magnolia DX Core
Component/s: None
Affects Version/s: None
Fix Version/s: 5.3

Type: Task Priority: Major
Reporter: Magnolia International Assignee: Magnolia International
Resolution: Fixed Votes: 1
Labels: None
Remaining Estimate: Not Specified
Time Spent: Not Specified
Original Estimate: Not Specified

Attachments: Text File ee-bundle-merge-how.txt     PNG File eebranchemerges.png    
Template:
Acceptance criteria:
Empty
Task DoR:
Empty

 Description   

This will help with version number maintenance and releases - those 2 always have to be released together, and when not, it gets confusing, since we display the version number from the module rather than the bundle.



 Comments   
Comment by Magnolia International [ 28/May/14 ]

now i'm wondering whether to do this for 5.3 only or all branches. a little extra work to merge it into all branches, but the whole module's repo is in (my) bundle repo, so it's a matter of merging corresponding branches and cherry-picking the pom fixes. That would mean we can get rid of the module's git repo (or put it in read-only). If not, we need to keep both git repos but somehow "close" the master ...

Comment by Magnolia International [ 28/May/14 ]

Attaching a file with pseudo-script for re-doing this if necessary.

Comment by Magnolia International [ 28/May/14 ]

Here's a picture of the "result"

Comment by Magnolia International [ 30/May/14 ]

The Enterprise module (git:enterprise/enterprise) is now "empty". Tags are still there for history/links, and I added a simple README. All branches from 3.6.x on are integrated in the corresponding branch of ee-bundle. The 3.0.x and 3.5.x aren't because the build of ee-bundle was broken for those. However, theses branches of the module exist in ee-bundle repo (so git checkout magnolia-enterprise-bundle-3.5.x; git checkout magnolia-module-enterprise-3.5.x;).

Generated at Mon Feb 12 05:29:12 CET 2024 using Jira 9.4.2#940002-sha1:46d1a51de284217efdcb32434eab47a99af2938b.