-
Sub-task
-
Resolution: Done
-
Blocker
-
None
For JBIDE 4.4.4.Final [Aerogear]: 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-aerogear at https://github.com/jbosstools/jbosstools-aerogear
Searching for commits present in master and missing from jbosstools-4.4.x
Commit hash "4661c6" is the last common ancestor of master and jbosstools-4.4.x
4661c6 is 6 commits ago in branch jbosstools-4.4.x
4661c6 is 8 commits ago in branch master
Commits missing from jbosstools-4.4.x that are in master:
- missing: Revert-
JBIDE-24341-comment-bump-up-to-parent-pom-version-4.4.4.Final-SNAPSHOT-close https://github.com/jbosstools/jbosstools-aerogear/commit/eef2e4ae44a04d11ed4d2c5f3a31972bdc7c3c1a - missing:
JBIDE-24341-comment-bump-up-to-parent-pom-version-4.4.4.Final-SNAPSHOT-close https://github.com/jbosstools/jbosstools-aerogear/commit/b854b2e8d7fec03ac240da85770f51accf863753 - missing: because-1.4.4-is-in-4.4.x-branch-must-be-1.4.100-in-master https://github.com/jbosstools/jbosstools-aerogear/commit/9243fb26684002154a30968d9ee009ad0e2e49b8
- missing:
JBIDE-24126-use-latest-thym-2.1.0.201703221647-in-master-branch https://github.com/jbosstools/jbosstools-aerogear/commit/f77fd94c5fe8cf165cf1c863395147b32269de54 - missing:
JBIDE-23944-Prepare-for-4.5.0.AM1-11.0.0.AM1-aerogear-hybrid https://github.com/jbosstools/jbosstools-aerogear/commit/287aa09fbcd7ee122b9da8431ad90075477c6213 - missing:
JBIDE-24001-Browsersim-and-Cordovasim-are-broken-since-jetty-v-9.4.0-was-added-to-TP https://github.com/jbosstools/jbosstools-aerogear/commit/2cafddea6db60f4b9ccbef7c3c66fbda7b4af672 - missing:
JBIDE-23944-comment-bump-up-to-parent-pom-version-4.5.0.AM1-SNAPSHOT-close https://github.com/jbosstools/jbosstools-aerogear/commit/03b5f9bd3bbc7b717e28f564c61674a780c986ea