Skip to content

Update to Java 25, Newer tps, etc#3638

Merged
cdietrich merged 43 commits into
mainfrom
cd-big-bump
Mar 13, 2026
Merged

Update to Java 25, Newer tps, etc#3638
cdietrich merged 43 commits into
mainfrom
cd-big-bump

Conversation

@cdietrich

Copy link
Copy Markdown
Contributor

No description provided.

@cdietrich cdietrich mentioned this pull request Mar 9, 2026
13 tasks
@github-actions

github-actions Bot commented Mar 9, 2026

Copy link
Copy Markdown

Test Results

  8 076 files  ±0    8 076 suites  ±0   3h 38m 46s ⏱️ - 1m 36s
 43 241 tests ±0   42 651 ✅  - 6    584 💤 ±0  6 ❌ +6 
212 508 runs  ±0  209 581 ✅  - 6  2 921 💤 ±0  6 ❌ +6 

For more details on these failures, see this check.

Results for commit 51b8399. ± Comparison against base commit fabc12e.

♻️ This comment has been updated with latest results.

Signed-off-by: Christian Dietrich <christian.dietrich.opensource@gmail.com>
@cdietrich

Copy link
Copy Markdown
Contributor Author
 07:00:09  [ERROR] Failed to execute goal org.apache.maven.plugins:maven-invoker-plugin:3.5.0:install (install dependencies in local test repo) on project xtend-archetype: The following artifacts could not be resolved: p2.eclipse.plugin:de.itemis.xtext.antlr:pom:2.1.1.v201405091103 (absent): Could not find artifact p2.eclipse.plugin:de.itemis.xtext.antlr:pom:2.1.1.v201405091103 in lsp4j-from-jenkins 

@HannesWell @LorenzoBettini @szarnekow does this ring a bell, e.g with respect to tycho 5?

@cdietrich

Copy link
Copy Markdown
Contributor Author

attempt: 0d65523

@HannesWell

HannesWell commented Mar 10, 2026

Copy link
Copy Markdown
Contributor
ent): Could not find artifact p2.eclipse.plugin:de.itemis.xtext.antlr:pom:2.1.1.v201405091103 in lsp4j-from-jenkins 

@HannesWell @LorenzoBettini @szarnekow does this ring a bell, e.g with respect to tycho 5?

This seems to be caused by Tycho 5.
I noticed this also in #3602.
But have not yet found a cause. But can investigate.

Regarding this change, for Java-25 I've already created a PR a while ago:

And from my POV would be ready for some time.
I just assumed you would first want to do the unification with respect to using maven.compiler.release, but for that I'm awaiting an M0 deployment:

This would unlock multiple PRs from my side, which I consider ready besides that.

@cdietrich

Copy link
Copy Markdown
Contributor Author

@HannesWell meanwhile i have a ton of stuff on this branch. the question is rather what i overlooked

  • min java version 21 (is there 17s i did not see)
  • min tp to 2025-12 (bom, tp, manifests)
  • constant for java 25 + test
  • wizard stuff
  • tycho

Comment thread full-build.sh Outdated
@cdietrich

Copy link
Copy Markdown
Contributor Author

@szarnekow @LorenzoBettini @HannesWell

rebased on changes by @HannesWell that are on main now
so this one should be reviewable now from my pov

@HannesWell

HannesWell commented Mar 12, 2026

Copy link
Copy Markdown
Contributor

In order to simplify the review and later tracing in the history I extracted your commits to move Xtext plugins to Java-21 and to drop support for Java-17, sorted them in to commits and created a separate PR with them:

This also includes a few missing clean-ups in the tests I found during review.
Plus updates in strict-jdk profiles in the root pom.xml that are now possible.

I've made sure to keep the diff to this PRs branch minimal and there are only a handful of merge conflicts (mainly in the Manifests due to closely located updated bundle requirements).
I can create a PR against this branch merging the new main if #3647 is accepted to not cause you extra work due to this extraction.

With that the number of changes in this PR should be significantly reduced where the majority are mechanical changes.

Comment thread Jenkinsfile Outdated
@cdietrich

Copy link
Copy Markdown
Contributor Author

@HannesWell do you see further split-off potential?

@HannesWell

Copy link
Copy Markdown
Contributor

do you see further split-off potential?

Yes, I think the TP updates can be further split off. I have just created a PR with that:

Then only the changes for deployment changes and building the relocations should remain.
But I don't know yet, what exactly the goal is and if it's intended to be permanently on master?

Should that also be exported into a dedicated PR so this becomes 'empty' and can be closed (to have a dedicated PR for context)?

@cdietrich

Copy link
Copy Markdown
Contributor Author

we need to discuss the relocation stuff
i did this in order to be able to test in xtext-reference-project
as gralde and maven still ask for the old corrdinates

<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
�IF config.javaVersion.isAtLeast(JavaVersion.JAVA25)�

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HannesWell why did you have this if/else?
afaik all simrels are still on java 21

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question.
I believe I did this because support for Java-25 is better with 2026-03, although it works already with 2025-03.
Should I remove it and always use 2025-03?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i believe we can do the rest with this pr. i will undo the stuff to fullbuild.sh for now and then later on check with lorenzo

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so ok with the remaineder of this pr? if yes ill merge once build is in, and tomorrow morning update the refefrence projects one as well

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine for me.
Thanks.

I'll have a look at mwe in the next days and will try to land my open PRs (I assume they need some adjustments now) and apply similar changes there too.

Comment thread Jenkinsfile Outdated
@HannesWell

Copy link
Copy Markdown
Contributor

we need to discuss the relocation stuff
i did this in order to be able to test in xtext-reference-project
as gralde and maven still ask for the old corrdinates

Understand. I've also extracted that into a dedicated PR so a dedicated discussion could happen there:

With that only the change of Maven-Central snapshot repositories remains as far as I can see. But from your comments I have the impression that it's a temporary change for testing and this PR is then effectively empty as everything has been extracted?

If that's correct, I suggest to close this and create dedicated follow-up PRs, e.g. if #3638 (comment) requires a change.

@cdietrich cdietrich merged commit 61da77f into main Mar 13, 2026
18 of 19 checks passed
@cdietrich cdietrich deleted the cd-big-bump branch March 13, 2026 19:39
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