-
Sub-task
-
Resolution: Done
-
Blocker
-
None
For JBIDE 4.4.4.Final [Discovery]: 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-discovery at https://github.com/jbosstools/jbosstools-discovery
Searching for commits present in master and missing from jbosstools-4.4.x
Commit hash "3532f2" is the last common ancestor of master and jbosstools-4.4.x
3532f2 is 19 commits ago in branch jbosstools-4.4.x
3532f2 is 15 commits ago in branch master
Commits missing from jbosstools-4.4.x that are in master:
- missing:
JBIDE-23834-remove-PMD-from-Central-until-it-can-be-fixed-upstream https://github.com/jbosstools/jbosstools-discovery/commit/83ea8e0fa6ab1161c09369447eba3f3174d2dc85- possible match: https://github.com/jbosstools/jbosstools-discovery/commit/e61a68ba5f87ee92d06d968c7efd7067277901a7
- Inspect the difference between the two patches: http://sprunge.us/JNhE
- possible match: https://github.com/jbosstools/jbosstools-discovery/commit/e61a68ba5f87ee92d06d968c7efd7067277901a7
- missing:
JBDS-4345-bump-to-11.0.0-in-master-branch https://github.com/jbosstools/jbosstools-discovery/commit/04b6f5dfb63e764a474dfaa2c796a8f11fcf774a - missing: move-up-to-testng-6.11.0.201703011520-in-master-branch https://github.com/jbosstools/jbosstools-discovery/commit/5ffdf1baef5660aac647bf4b404268d289296aa8
- missing: remove-unnededed-mylyn-and-aspectj-ajdt-stuff https://github.com/jbosstools/jbosstools-discovery/commit/b67409a73fe2a116d909a70a66c20a7568974f43
- missing:
JBIDE-23317-prepare-first-draft-of-Oxygen.0.M5-target-platform-needs-to-have-IU-versions-updated-so-don-t-merge-yet https://github.com/jbosstools/jbosstools-discovery/commit/53ea8422aed76d28c7e44b5e44d8ca300a001308 - missing: prepare-for-4.5.0.AM1-in-master https://github.com/jbosstools/jbosstools-discovery/commit/43f27ac24e8c9d997cbc6cd0fe51b88a260576af