search

saros-project / saros

Open Source IDE plugin for distributed collaborative software development
https://www.saros-project.org
GNU General Public License v2.0
160 stars 52 forks source link

[BUILD] Workaround for build fail #1139

Closed FKHals closed 3 years ago

FKHals commented 3 years ago

This is a temporary fix for #1138.

This is not a proposed solution and the workaround will most probably need to be updated for coming versions of org.eclipse.platform:org.eclipse.ui.ide (the version of which is also part of another workaround, see here). Actually discussion about long-term fixes should be done in #1138.

Drakulix commented 3 years ago

So the same as in #1114 and #1086 again?

FKHals commented 3 years ago

So the same as in #1114 and #1086 again?

Yes, pretty much. The reason seems to be that javax.annotation:javax.annotation-api is deprecated and has been replaced by jakarta.annotation-api which should have an identical API and also fits the version boundaries [1.3.5, 2.0.0) given by org.eclipse.e4.core.di. So it seems like the author may have overseen that also the package name should be changed but that is just an assumption.

FKHals commented 3 years ago

Rebased on the master.

Unfortunately that requires the approval to be renewed (Is there a better solution to do rebases without requiring approval for the same changes?)

Drakulix commented 3 years ago

Rebased on the master.

Unfortunately that requires the approval to be renewed (Is there a better solution to do rebases without requiring approval for the same changes?)

You can use the "Merge"-Button from github, that keeps Reviews, but clutters the commit history. But for simple one-commit changes like this one, that does not matter, because we can easily squash it all on merge.