-
Sub-task
-
Resolution: Done
-
Blocker
-
None
For JBIDE 4.4.4.Final [Server]: 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-server at https://github.com/jbosstools/jbosstools-server
Searching for commits present in master and missing from jbosstools-4.4.x
Commit hash "e4ea00" is the last common ancestor of master and jbosstools-4.4.x
e4ea00 is 37 commits ago in branch jbosstools-4.4.x
e4ea00 is 34 commits ago in branch master
Commits missing from jbosstools-4.4.x that are in master:
- missing:
JBIDE-23869-consume-jolokia-snapshot-with-our-classcast-fix https://github.com/jbosstools/jbosstools-server/commit/a4b6166f61da59e22a03cfe7d0425aa6bdec12b5- possible match: https://github.com/jbosstools/jbosstools-server/commit/a910e333f88ba38c5e15d7664f8c9fe724bbda7b
- Inspect the difference between the two patches: http://sprunge.us/QJDU
- possible match: https://github.com/jbosstools/jbosstools-server/commit/a910e333f88ba38c5e15d7664f8c9fe724bbda7b
- missing:
JBIDE-24233-force-connections-for-wf8-and-above-to-use-http-remoting-protocol https://github.com/jbosstools/jbosstools-server/commit/b18d91e688619560745982c18b03eb4127187bca- possible match: https://github.com/jbosstools/jbosstools-server/commit/b5e4c0d194f5103ee0622323ec285156200d6e2e
- Inspect the difference between the two patches: http://sprunge.us/YhRR
- possible match: https://github.com/jbosstools/jbosstools-server/commit/b5e4c0d194f5103ee0622323ec285156200d6e2e
- missing:
JBIDE-24138-fix-test-case-for-oxygen-api-changes https://github.com/jbosstools/jbosstools-server/commit/569d7acdd38b64af5d69f86ecf9e01907ccdc2df - missing:
JBIDE-24138-Implement-QueryMBeans-for-JolokiaMBeanServerConnection https://github.com/jbosstools/jbosstools-server/commit/cb974c9f9791a32a775164f188d3a96ce440c5da- possible match: https://github.com/jbosstools/jbosstools-server/commit/2c02ace0653c097733417ff3ecc1e310441db894
- Inspect the difference between the two patches: http://sprunge.us/XUZe
- possible match: https://github.com/jbosstools/jbosstools-server/commit/2c02ace0653c097733417ff3ecc1e310441db894
- missing: Bump-root-pom-so-update-site-appears-correct https://github.com/jbosstools/jbosstools-server/commit/f2848a0506a76b1fe8a8fa23d25b5792cdc9c9c3
- possible match: https://github.com/jbosstools/jbosstools-server/commit/3dd7251c190dce7a6a107b9ff382848e794e5c43
- Inspect the difference between the two patches: http://sprunge.us/SRMR
- possible match: https://github.com/jbosstools/jbosstools-server/commit/3dd7251c190dce7a6a107b9ff382848e794e5c43
- missing:
JBIDE-22717-Remvoe-Event-Log https://github.com/jbosstools/jbosstools-server/commit/d82e9f9b649b4cca276d367fde162eedad73e5f6 - missing: Failing-Unit-Tests-secure-storage-related-MASTER-ONLY https://github.com/jbosstools/jbosstools-server/commit/d84d2b1278ea9466595d992c06fc344405d24623
- missing:
JBIDE-24043-upversion-master https://github.com/jbosstools/jbosstools-server/commit/e3a065a0ea76caae9212aa376f448d80dc479cc0 - missing:
JBIDE-24029-JBIDE-24031https://github.com/jbosstools/jbosstools-server/commit/778cc2dc271e5fef9b8b23c103bb57e0db6a205b- possible match: https://github.com/jbosstools/jbosstools-server/commit/82d51ba3185088bc21471ae8c2c4c76ffd677621
- Inspect the difference between the two patches: http://sprunge.us/RMNB
- possible match: https://github.com/jbosstools/jbosstools-server/commit/82d51ba3185088bc21471ae8c2c4c76ffd677621
- missing:
JBIDE-23956-comment-bump-up-to-parent-pom-version-4.5.0.AM1-SNAPSHOT-close https://github.com/jbosstools/jbosstools-server/commit/442b33bc7e241b7e9603bf9dcf54e9f647011704