> Please respin the SimRel repo to include the contribution
and please revert the removal changes from EPP packages and respin
those as well.
I've now updated and re-enabled the EMF Compare contribution to
cope with the EGit breaks. Please take this into account as well
for the respin.
> In retrospect, it also seems kind of pointless to put upper
bounds on the EGit/JGit dependencies. E.g., CDT isn't broken
because it only has no upper limit... EMF compare has mostly
removed the upper limits as well, at least from the bundles...
EGit broke its APIs twice in the last few releases. "no upper
limit" wouldn't have broken the simrel, but the final repository
itself would have either been broken (NoSuchMethodException from
any user of EMF Compare) or there would have been two versions of
EGit, depending on how the wiring would have gone.
What was
Activator.getDefault().getRepositoryCache().lookupRepository(gitDir);
Became
RepositoryCache.getInstance().lookupRepository(gitDir);
between 5.10 and 5.11
org.eclipse.egit.core is not exposed as public API, looks like some of the API in this package should be made public if you depend on it
This once again changed to
RepositoryCache.INSTANCE.lookupRepository(gitDir);
between 5.13 and 6.0.
Removing the upper limit is not an answer here.
Laurent
On 07/10/2021 08:57, Ed Merks wrote:
Hi,
To prevent such problems in the future, I strongly suggest that
EGit/JGit should be at +2 or better yet at +1 but definitely not
+3. This will also help with the scenario of making
contributions so late on the final day.
Note that EGit/JGit has very few things on which it depends
but quite a few things depend on it:
In retrospect, it also seems kind of pointless to put upper
bounds on the EGit/JGit dependencies. E.g., CDT isn't broken
because it only has no upper limit... EMF compare has mostly
removed the upper limits as well, at least from the bundles...
I disabled the
feature org.eclipse.emf.compare.egit.feature.group
to workaround this issue
and hit the next problem in oomph requiring
jgit/egit [5.12.0,5.13.0) which again isn't compatible with
6.0.0.202110060947-m1 which I am trying to
contribute.
22:51:10 [0]Missing requirement: Git integration for Eclipse - Core 5.12.0.202106070339-r (org.eclipse.egit.core 5.12.0.202106070339-r) requires 'java.package; org.eclipse.jgit.annotations [5.12.0,5.13.0)' but it could not be found
22:51:10
22:51:10 JavaPackage(org.eclipse.jgit.annotations [5.12.0,5.13.0)) is required by:
I pushed our contribution [1]
though the simrel validation build fails
[2] with the error
22:27:06 [0]Missing requirement: EMF
Compare EGit Support 1.2.4.202107200824
(org.eclipse.emf.compare.egit
1.2.4.202107200824) requires
'osgi.bundle; org.eclipse.jgit
[4.9.0,6.0.0)' but it could not be found
22:27:06
22:27:06 Bundle(org.eclipse.jgit
[4.9.0,6.0.0)) is required by:
22:27:06 ValidationSet(main)
22:27:06 Contribution(EMF Compare)
22:27:06 MappedRepository(https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202107200824)
22:27:06
Feature(org.eclipse.emf.compare.egit.feature.group)
22:27:06
InstallableUnit(org.eclipse.emf.compare.egit
1.2.4.202107200824)
because org.eclipse.emf.compare.egit
requires org.eclipse.jgit [4.9.0,6.0.0).
This can't work since JGit/EGit
bumped their version to 6.0 (our M1
contribution is 6.0.0.202110060947-m1)
as announced earlier on this list
[3].
org.eclipse.emf.compare.egit needs to
bump the upper boundary of the jgit/egit
version they require to allow 6.0.x.
How can I get our contribution in ?
Disable the emf.compare contribution
until they fixed this version range ?