-
Sub-task
-
Resolution: Done
-
Blocker
-
None
For JBIDE 4.4.4.Final [Base]: 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-base at https://github.com/jbosstools/jbosstools-base
Searching for commits present in master and missing from jbosstools-4.4.x
Commit hash "722dac" is the last common ancestor of master and jbosstools-4.4.x
722dac is 18 commits ago in branch jbosstools-4.4.x
722dac is 19 commits ago in branch master
Commits missing from jbosstools-4.4.x that are in master:
Curious Patches:
- missing:
JBIDE-23833-more-complete-solution-to-remove-JIRA-support-from-org.jboss.tools.common.mylyn-including-removing-test-in-common-tests-org.jboss.tools.common.mylyn.test-src-org-jboss-tools-common-mylyn-test-RepositoryTest.java-and-bumping-all-containing-features-too-568 https://github.com/jbosstools/jbosstools-base/commit/178187840622aab9f2878e743a78d2702667432e
Master-only patches that are verified master-only:
- missing:
JBIDE-24074-bump-plugin-version https://github.com/jbosstools/jbosstools-base/commit/6c847228f78b091feb4fdb261e3332cc94909c84- possible match: https://github.com/jbosstools/jbosstools-base/commit/17f9990bc11020e561a5b9c7184ad7de83d153e1
- Inspect the difference between the two patches: http://sprunge.us/iJWU
- possible match: https://github.com/jbosstools/jbosstools-base/commit/17f9990bc11020e561a5b9c7184ad7de83d153e1
- missing:
JBIDE-24081-bump-feature-plugin-version https://github.com/jbosstools/jbosstools-base/commit/d99a2f1174b1e4bbd2a977cdf713691f0b202064- possible match: https://github.com/jbosstools/jbosstools-base/commit/bcc7f29dc37479aa8591d9c1b93719099fbcec65
- Inspect the difference between the two patches: http://sprunge.us/TeCf
- possible match: https://github.com/jbosstools/jbosstools-base/commit/bcc7f29dc37479aa8591d9c1b93719099fbcec65
- missing: Revert-
JBIDE-24343-comment-bump-up-to-parent-pom-version-4.4.4.Final-SNAPSHOT-close https://github.com/jbosstools/jbosstools-base/commit/569f8bbd655368e0d0fdbcfc92e3d6f54b3eca2e - missing:
JBIDE-24343-comment-bump-up-to-parent-pom-version-4.4.4.Final-SNAPSHOT-close https://github.com/jbosstools/jbosstools-base/commit/642a7b9710ef3d4506ae5e7d12cf98427b798f96 - missing: Upversion-common-foundation-and-runtime https://github.com/jbosstools/jbosstools-base/commit/2a07e015961cb537b1075e383839c96c8f8e4bf2
- missing:
JBIDE-23677-use-parent-pom-to-define-jbosstools.version-currentversion.properties-not-root-pom-566 https://github.com/jbosstools/jbosstools-base/commit/cc566c72423f97f2b6d018d77bf242f0dc35995b - missing: bump-foundation-plugins-org.jboss.tools.foundation.core-src-org-jboss-tools-foundation-core-properties-internal-currentversion.properties-to-4.5.0.Final https://github.com/jbosstools/jbosstools-base/commit/0a02f12e893f4365aeb8748c0fdb6e71ab06aa41
- missing:
JBIDE-23677-temporary-workaround-to-move-foundation.core-to-correct-version-4.5.0.AM1 https://github.com/jbosstools/jbosstools-base/commit/0afb3a71186a738efb7f529bfbcd8e781450a187 - missing:
JBIDE-24014-fix-versions-in-master-branch-bump-to-1.4.0-SNAPSHOT-in-changed-plugins-features-559 https://github.com/jbosstools/jbosstools-base/commit/6f11308a03e390fd1a59f599ec93782ff46d6ed1 - missing:
JBIDE-23967-compile-failed-migration-needed-to-Oxygen.0.M5-554 https://github.com/jbosstools/jbosstools-base/commit/8571dc1811b4c06492e3fc044aaa194a44e4675b - missing:
JBIDE-23946-comment-bump-up-to-parent-pom-version-4.5.0.AM1-SNAPSHOT-close https://github.com/jbosstools/jbosstools-base/commit/a8a42e5d22269d310a11dc638f7c4ccb788baaca