Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TP] update to Eclipse 4.30 and latest versions of other dependencies #1609

Merged
merged 1 commit into from
Dec 30, 2023

Conversation

HannesWell
Copy link
Contributor

Create this update for now as a draft to test compatibility with the upcoming release.

Copy link

github-actions bot commented Nov 18, 2023

Test Results

107 files  ±0  107 suites  ±0   7m 9s ⏱️ +4s
662 tests ±0  652 ✅ ±0  10 💤 ±0  0 ❌ ±0 
662 runs  ±0  651 ✅ ±0  11 💤 ±0  0 ❌ ±0 

Results for commit b04eb93. ± Comparison against base commit f3b12d7.

♻️ This comment has been updated with latest results.

@HannesWell
Copy link
Contributor Author

Looks like the m2e.tests.common need to adapt to the migration from Jetty 10 to 12.
@laeubi or @merks do you know anything about how to do that?

@merks
Copy link
Contributor

merks commented Nov 19, 2023

No, for BIRT and WTP, someone else did the work.

Maybe these changes will give inspiration:

@HannesWell HannesWell force-pushed the eclipse_4.30 branch 4 times, most recently from 86fd54f to 45f61a8 Compare December 28, 2023 08:52
@merks
Copy link
Contributor

merks commented Dec 28, 2023

I guess you hold off updating guava until this is done?

https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/12173

@HannesWell
Copy link
Contributor Author

I guess you hold off updating guava until this is done?

https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/12173

Actually I wanted to include the Guava update, but have to admit that I forgot it. Thanks for the heads up. But with that issue open, I'll postpone this to another PR.

@laeubi
Copy link
Member

laeubi commented Dec 28, 2023

/request-license-review

Copy link

/request-license-review

License review requests:

After all reviews have concluded, re-run the license-vetting check from the Github Actions web-interface to update its status.

Workflow run (with attached summary files):
https://github.com/eclipse-m2e/m2e-core/actions/runs/7346271616

@laeubi
Copy link
Member

laeubi commented Dec 28, 2023

@HannesWell what do you think about replace guava cache with the alternative you mentioned recently?

@HannesWell
Copy link
Contributor Author

@HannesWell what do you think about replace guava cache with the alternative you mentioned recently?

I would be in favor of that and already did that in #507, but it was not fully working and parts of it were reverted in #928. But as mentioned there, I assume that with small extra steps it can still be done without Guava.

See also #1288.
But in the end the Maven runtime requires Guava and we (as m2e) therefore cannot really get rid of Guava as long as Maven requires it.

@HannesWell HannesWell marked this pull request as ready for review December 30, 2023 17:39
@HannesWell
Copy link
Contributor Author

@laeubi do you have any idea why the new bnd version generates he packages javax.lang.model.element, java.lang.annotation, java.lang on Jenkins but only (the old packages) javax.lang.model.element on the GH runners in the OSGiMetadataGenerationTest?

@laeubi
Copy link
Member

laeubi commented Dec 30, 2023

I just remmber that I needed to adjusted Tycho tests to include the new packages, it could be that Tycho is using a cached variant so maybe you need to delete the caches here:
https://github.com/eclipse-m2e/m2e-core/actions/caches

@HannesWell
Copy link
Contributor Author

OK, thanks for the hint.
I deleted all caches and restarted the builds. Lets see if this helps.

@HannesWell
Copy link
Contributor Author

I just remmber that I needed to adjusted Tycho tests to include the new packages, it could be that Tycho is using a cached variant so maybe you need to delete the caches here: https://github.com/eclipse-m2e/m2e-core/actions/caches

Looks like that was it. 🎉
So this is finally ready.

@HannesWell HannesWell merged commit 75cbe3a into eclipse-m2e:master Dec 30, 2023
6 of 7 checks passed
@HannesWell HannesWell deleted the eclipse_4.30 branch December 30, 2023 20:26
@HannesWell HannesWell added this to the 2.6.0 milestone Feb 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants