-
Sub-task
-
Resolution: Done
-
Blocker
-
None
For JBIDE 4.4.4.Final [JST]: Ensure all commits pushed to master have either been made in jbosstools-4.4.x, or are intentionally excluded from jbosstools-4.4.x.
Below are listed all commits made to master that have not been found in jbosstools-4.4.x. It is possible these commits do exist in jbosstools-4.4.x, but the patches are not identical. It is also possible that the commits made in master are not relevant to jbosstools-4.4.x or should not be applied.
If there are no commits listed below, please close (do not resolve) this issue.
Otherwise:
1) Click on each link below.
2) Evaluate whether the given commit should be in jbosstools-4.4.x
3) If it should be in jbosstools-4.4.x, please find out why it is not in jbosstools-4.4.x. You may need to browse jbosstools-4.4.x's commit log to find a commit that should match.
4) If you cannot find a matching commit, and it should be committed to jbosstools-4.4.x, please cherry-pick that commit to jbosstools-4.4.x or otherwise merge it in.
5) In comments, please indicate any suspicious commits (ie, commits not related to simple version changes), whether it exists in jbosstools-4.4.x, whether you have successfully merged it in now, or whether it is not intended to be committed to jbosstools-4.4.x or is inappropriate for jbosstools-4.4.x.
6) When all complete, please close (do not resolve) this issue.
Folder: jbosstools-jst at https://github.com/jbosstools/jbosstools-jst
Searching for commits present in master and missing from jbosstools-4.4.x
Commit hash "63bdf7" is the last common ancestor of master and jbosstools-4.4.x
63bdf7 is 5 commits ago in branch jbosstools-4.4.x
63bdf7 is 5 commits ago in branch master
Commits missing from jbosstools-4.4.x that are in master:
- missing: simpler-approach-to-defining-tern-site-
JBIDE-23484https://github.com/jbosstools/jbosstools-jst/commit/d9f53659ea8a59365c11db65adeb17e850aaa7c8 - missing:
JBDS-4132-move-to-tern-1.2.1.201611022209 https://github.com/jbosstools/jbosstools-jst/commit/b8b87a32c156551790de0685dc09dbebd1a4bd67- possible match: https://github.com/jbosstools/jbosstools-jst/commit/55a4b62e6dc9b0e5cb840c40f7387f4109decaef
- Inspect the difference between the two patches: http://sprunge.us/eMYK
- possible match: https://github.com/jbosstools/jbosstools-jst/commit/55a4b62e6dc9b0e5cb840c40f7387f4109decaef
- missing:
JBIDE-23953-comment-bump-up-to-parent-pom-version-4.5.0.AM1-SNAPSHOT-close https://github.com/jbosstools/jbosstools-jst/commit/ec3619878143e29ee2c4b64f0e25166c62bb9d2c