Merge zanata-parent,-api,-common,-client with zanata-server

Description

As described in ZNTA-770, having multiple repositories is affecting our ability to do continuous integration, and to test changes which require api, server and client to be modified together ("synchronised pull requests").

Back in 2012, the idea of splitting these repositories was to allow them to follow different lifecycles, but in practice they always tend to be released together anyway (see for example Zanata 4.0.0-alpha-1), especially as we try to move towards continuous delivery.

We need to look at putting them all back in a single repository. This should make our release scripts far simpler, and avoid problems like server pointing to the wrong api snapshot, or changes in api breaking the server build.

git subtree add could be used for this, but the resulting git history for individual files is not good (and existing pull requests would probably become modify/delete conflicts).

I think the best option for us is git remote add, mv, merge:

NB: This wiki page will become obsolete: https://github.com/zanata/zanata-server/wiki/Git-Submodules

Activity

Show:
Sean Flanigan
October 28, 2016, 2:41 AM

There are a few related tasks still to be done, but they will be tracked by the epic ZNTA-770.

Sean Flanigan
October 28, 2016, 2:37 AM
Sean Flanigan
October 17, 2016, 4:50 AM
  • Merge .git* files and .travis* files

    • Travis support will be removed, since we haven't been able to build the whole project, and it duplicates other builds anyway

  • Perform a full test build

    • This will be done as part of the PR build

  • Test mvn deploy (with modified deployment target, eg /tmp/cloudbees and /tmp/ossrh)

    • Unable to provide two different values for deploy plugin's -DaltDeploymentRepository option, so I had to deploy to the real snapshot repos, but it did work

  • Test the procedure for merging in a pre-existing PR (check clean file history with git log)

    • git log requires --follow to show history before the rename (including the PR change)

    • git blame and git gui blame seem follow the rename automatically

Sean Flanigan
October 14, 2016, 9:00 AM
Edited

Still to do:

  • Merge .git* files and .travis* files

  • Perform a full test build

  • Test mvn deploy (with modified deployment target, eg /tmp/cloudbees and /tmp/ossrh)

  • Test procedure for merging in a pre-existing PR (check clean file history with git log)

Sean Flanigan
October 14, 2016, 8:57 AM
Ready for Release

Assignee

Sean Flanigan

Reporter

Sean Flanigan

Labels

None

Tested Version/s

None

Story Points

3

Sprint

None

Fix versions

Priority

unspecified