Skip to content

Update to Java 25, Newer tps, etc #3638

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.

Sign up for GitHub

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

Merged
cdietrich merged 43 commits into from
Mar 13, 2026
Merged

Update to Java 25, Newer tps, etc #3638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
66f156e
bump versions to 21
cdietrich Mar 9, 2026
6b9dbb5
Java 25 constant
cdietrich Mar 9, 2026
c72bd4a
WIzard ajustments
cdietrich Mar 9, 2026
9118f32
bump tycho version
cdietrich Mar 9, 2026
284464b
attempt to fix tycho5 build
cdietrich Mar 9, 2026
dc6b83f
fix launches
cdietrich Mar 9, 2026
809d78c
wizard adjustment
cdietrich Mar 9, 2026
3f919fe
more adjustments
cdietrich Mar 9, 2026
0f31639
fixes
cdietrich Mar 9, 2026
f77e42e
another fix
cdietrich Mar 9, 2026
bc07ec3
typo fix
cdietrich Mar 9, 2026
fafed39
more fixes
cdietrich Mar 9, 2026
074e8ee
fixes
cdietrich Mar 9, 2026
ede9d79
typos
cdietrich Mar 9, 2026
087b3e8
fix test expectations
cdietrich Mar 10, 2026
df0499c
bump bom versions
cdietrich Mar 10, 2026
0d65523
attemp to fix tycho mimimi
cdietrich Mar 10, 2026
3b8423a
bump versions in manifest
cdietrich Mar 10, 2026
eaf820c
More mf bumps
cdietrich Mar 10, 2026
d9cd78a
attempt to also build the relocations
cdietrich Mar 10, 2026
fc1f665
Merge pull request #3639 from eclipse-xtext/cd-bump-in-manifests
cdietrich Mar 10, 2026
184ab76
wizard workarcound
cdietrich Mar 10, 2026
13a2722
temp. disable test
cdietrich Mar 11, 2026
4893c04
always run with 25
cdietrich Mar 11, 2026
8abe5c4
Merge remote-tracking branch 'origin/main' into cd-big-bump
cdietrich Mar 11, 2026
2eecc11
fix typo
cdietrich Mar 11, 2026
2015541
fix merge conflict
cdietrich Mar 11, 2026
91b14bf
more merge fixes
cdietrich Mar 11, 2026
6827909
test adjustments
cdietrich Mar 11, 2026
38a8b81
Merge remote-tracking branch 'origin/main' into cd-big-bump
cdietrich Mar 11, 2026
d765001
Merge remote-tracking branch 'origin/main' into cd-big-bump
cdietrich Mar 12, 2026
cc28581
fix hidden merge conflict
cdietrich Mar 12, 2026
07f392e
more conflicts
cdietrich Mar 12, 2026
16f452f
Merge remote-tracking branch 'origin/main' into cd-big-bump
cdietrich Mar 12, 2026
376af94
restore order
cdietrich Mar 12, 2026
3d395d4
fix: merge problems
cdietrich Mar 12, 2026
a37cf10
Merge remote-tracking branch 'origin/main' into cd-big-bump
cdietrich Mar 13, 2026
609d11c
review feedback
cdietrich Mar 13, 2026
a4e183d
Merge remote-tracking branch 'origin/main' into cd-big-bump
cdietrich Mar 13, 2026
40fcc7f
cleanup
cdietrich Mar 13, 2026
6b293f3
Merge remote-tracking branch 'origin/main' into cd-big-bump
cdietrich Mar 13, 2026
3048500
undo temp changes
cdietrich Mar 13, 2026
51b8399
cleanup
cdietrich Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions full-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,15 @@ MVN_ARGS+=(-PuseJenkinsSnapshots)

MVN_ARGS+=("-Dmaven.home=$(./mvnw --version | grep "Maven home:" | cut -c 13-)")

#echo ./mvnw -B -f org.eclipse.xtend.relocated.parent ${MVN_ARGS[@]} $@
#
#./mvnw -B \
# -f org.eclipse.xtend.relocated.parent \
# clean deploy \
# -DaltDeploymentRepository=local::default::file:./build/maven-repository \
# ${MVN_ARGS[@]} \
# $@

echo ./mvnw -B -f org.eclipse.xtext.full.releng ${MVN_ARGS[@]} $@

#echo "Using target platform '$TARGET_PLATFORM'"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/src/org/eclipse/xtext/util/JavaVersionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2018 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2018, 2026 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/wizard/cli/CliWizardIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.eclipse.xtext.xtext.wizard.cli;
Expand Down
2 changes: 1 addition & 1 deletion ....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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"/>
<repository location="https://download.eclipse.org/releases/2025-12"/>
<repository location="https://download.eclipse.org/releases/2026-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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"/>
<repository location="https://download.eclipse.org/releases/2025-12"/>
<repository location="https://download.eclipse.org/releases/2026-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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"/>
<repository location="https://download.eclipse.org/releases/2025-12"/>
<repository location="https://download.eclipse.org/releases/2026-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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"/>
<repository location="https://download.eclipse.org/releases/2025-12"/>
<repository location="https://download.eclipse.org/releases/2026-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ...ychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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"/>
<repository location="https://download.eclipse.org/releases/2025-12"/>
<repository location="https://download.eclipse.org/releases/2026-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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"/>
<repository location="https://download.eclipse.org/releases/2025-12"/>
<repository location="https://download.eclipse.org/releases/2026-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ...lipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2015, 2025 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2026 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
Expand Down
6 changes: 1 addition & 5 deletions ...eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,7 @@ class TargetPlatformProject extends ProjectDescriptor {
<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)»

@cdietrich cdietrich Mar 13, 2026

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

@HannesWell HannesWell Mar 13, 2026

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?

@cdietrich cdietrich Mar 13, 2026

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

@cdietrich cdietrich Mar 13, 2026

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

@HannesWell HannesWell Mar 14, 2026

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.

<repository location="https://download.eclipse.org/releases/2026-03"/>
«ELSE»
<repository location="https://download.eclipse.org/releases/2025-12"/>
«ENDIF»
<repository location="https://download.eclipse.org/releases/2026-03"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion ....xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/ParentProjectDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2015, 2025 itemis AG (http://www.itemis.eu) and others.
* Copyright (c) 2015, 2026 itemis AG (http://www.itemis.eu) and others.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
Expand Down
15 changes: 3 additions & 12 deletions ...se.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,9 @@ public CharSequence target() {
_builder.append("\t\t\t");
_builder.append("<unit id=\"org.eclipse.emf.sdk.feature.group\" version=\"0.0.0\"/>");
_builder.newLine();
{
boolean _isAtLeast_1 = this.getConfig().getJavaVersion().isAtLeast(JavaVersion.JAVA25);
if (_isAtLeast_1) {
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2026-03\"/>");
_builder.newLine();
} else {
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2025-12\"/>");
_builder.newLine();
}
}
_builder.append("\t\t\t");
_builder.append("<repository location=\"https://download.eclipse.org/releases/2026-03\"/>");
_builder.newLine();
_builder.append("\t\t");
_builder.append("</location>");
_builder.newLine();
Expand Down
Loading