Java 17 as minimal version, 2024-03 as minimal platform, updated BOM and minimal dependencies #3233

LorenzoBettini · 2024-10-29T18:06:45Z

Moreover,

the wizards use Java 17 as the minimal version
in the BOM I used properties when feasible
explanation for ce2c171: now that Java 17 is enabled for byte code, strictfp tests had to be adapted (I was wrong about failure only in Java 21: strictfp has been removed from byte code since Java 17); Concerning org.eclipse.xtext.common.types.access.impl.AbstractTypeProviderTest.testMethods_publicStrictFpMethod_01(), I removed it, because in this test project we also use project with sources and 1.8 compilation level. I preferred to keep things as they are, and simply removed this test that wouldn't make sense anymore, anyway.

cdietrich · 2024-10-29T18:13:22Z

i assume the following is planned for later

javaversion enum
wizard tests
other adaptations, default values / references of JavaVersion.11 usages, isAtLeast calls etc
reflection switches against older tps eg m2e

LorenzoBettini · 2024-10-29T18:19:40Z

i assume the following is planned for later

javaversion enum

Do you mean remove old versions?

wizard tests

That's already implemented in this PR

other adaptations, default values / references of JavaVersion.11 usages, isAtLeast calls etc

If you mean remove old tests, then yes, it'll be in another PR

reflection switches against older tps eg m2e

Yes for switches. I don't understand m2e

cdietrich · 2024-10-29T18:27:00Z

javaversion enum
here we deprecate stuff

m2e:
org.eclipse.xtext.m2e.XtextProjectConfigurator.call(T, String, String)

LorenzoBettini · 2024-10-29T18:30:23Z

javaversion enum here we deprecate stuff

m2e: org.eclipse.xtext.m2e.XtextProjectConfigurator.call(T, String, String)

Sorry, I don't understand

cdietrich · 2024-10-29T18:30:35Z

regarding wizard.
still see

cdietrich · 2024-10-29T18:31:16Z

i guess we also need to check the java 8 removal to find out what else we did back then

cdietrich · 2024-10-29T18:33:00Z

@HannesWell might be able to explain the m2e stuff or we need to search the old pr
there is different m2e in current eclipses and the old minimal target platform
so we do reflection crap to deal with it

LorenzoBettini · 2024-10-29T18:38:26Z

regarding wizard. still see

The two projects are slightly different, concerning some configurations, and the first one uses Java 17 now anyway.

cdietrich · 2024-10-29T18:41:57Z

am blind ?!?

LorenzoBettini · 2024-10-29T18:50:06Z

am blind ?!?

Then I got confused by another one. I'll remove the second one.

cdietrich · 2024-10-29T18:51:06Z

regaerding emf. this reminds me of the last emf updated.
there we also had a cascade in fragments genmodels etc
regarding minimal emf version.
https://github.com/eclipse/xtext-core/pull/2033/files

am not sure if we should do everything in one go given the time constraints

LorenzoBettini · 2024-10-29T18:54:04Z

regaerding emf. this reminds me of the last emf updated. there we also had a cascade in fragments genmodels etc regarding minimal emf version. https://github.com/eclipse/xtext-core/pull/2033/files

am not sure if we should do everything in one go given the time constraints

I'd postpone that, and we'll also have to regenerate the languages

cdietrich · 2024-10-29T18:55:56Z

@iloveeclipse @mehmet-karaman i wonder if you could test this branch in your env

iloveeclipse · 2024-10-29T19:01:05Z

i wonder if you could test this branch in your env

@mehmet-karaman : if you can change our Xtext build to use this branch instead of master, I could try to build platform with that on next Monday and run tests.

@cdietrich : I'm out of PC till monday.

github-actions · 2024-10-29T19:15:08Z

Test Results

4 850 files ± 0 4 850 suites ±0 2h 35m 42s ⏱️ + 4m 15s
43 238 tests - 4 42 653 ✅ + 5 584 💤 - 10 1 ❌ +1
127 736 runs - 15 125 974 ✅ +17 1 752 💤 - 30 10 ❌ - 2

For more details on these failures, see this check.

Results for commit 8b5474b. ± Comparison against base commit e3ec7fb.

This pull request removes 11 and adds 7 tests. Note that renamed tests count towards both.

org.eclipse.xtext.common.types.access.jdt.JdtTypeProviderTest ‑ testMethods_publicStrictFpMethod_01
org.eclipse.xtext.common.types.access.jdt.SourceBasedJdtTypeProviderTest ‑ testMethods_publicStrictFpMethod_01
org.eclipse.xtext.xtext.wizard.WizardConfigurationTest ‑ allBuildSystemsUseJava11
org.eclipse.xtext.xtext.wizard.WizardConfigurationTest ‑ allBuildSystemsUseOtherJava
org.eclipse.xtext.xtext.wizard.WizardConfigurationTest ‑ p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabledJ11
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[11: Maven|Plain|HIERARCHICAL|Fat Jar]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[12: Gradle|Plain|HIERARCHICAL|Fat Jar]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[14: Maven|Plain|HIERARCHICAL|Regular]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[15: Gradle|Plain|HIERARCHICAL|Regular]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[8: Maven|Plain|HIERARCHICAL|None]
…

org.eclipse.xtext.xtext.wizard.WizardConfigurationTest ‑ allBuildSystemsUseJava17
org.eclipse.xtext.xtext.wizard.WizardConfigurationTest ‑ p2ProjectsEnablesSourceGenerationWithTychoWhenMavenBuiltIsEnabled
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[11: Gradle|Plain|HIERARCHICAL|Fat Jar]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[12: Maven|Plain|HIERARCHICAL|Regular]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[14: Gradle|Plain|HIERARCHICAL|Regular]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[8: Gradle|Plain|HIERARCHICAL|None]
org.eclipse.xtext.xtext.wizard.cli.CliWizardIntegrationTest ‑ testProjectCreation[9: Maven|Plain|HIERARCHICAL|Fat Jar]

♻️ This comment has been updated with latest results.

HannesWell · 2024-10-30T00:00:21Z

@HannesWell might be able to explain the m2e stuff or we need to search the old pr
there is different m2e in current eclipses and the old minimal target platform
so we do reflection crap to deal with it

The changes are

So if you use m2e-2.0+ in your minimal target now you can just call ProjectConfigurationRequest.mavenProjectFacade() and ProjectConfigurationRequest.mavenProject() and remove the reflection code.

LorenzoBettini · 2024-10-30T06:59:25Z

@cdietrich I've updated the project wizard tests 5fdf15d

I removed the duplicate mavenTychoP2J17 and renamed another one that uses JUnit 5 (that was the project I mentioned above, concerning a slightly different configuration).

cdietrich · 2024-10-30T08:17:28Z

thx @LorenzoBettini
there still seem to be files e.g. launches, manifest.mf_gen mentioning
JavaSE-11

cdietrich · 2024-10-30T08:31:38Z

is it ok when i push the cleanup of TargetPlatformProject?

LorenzoBettini · 2024-10-30T10:08:08Z

is it ok when i push the cleanup of TargetPlatformProject?

What do you mean?

cdietrich · 2024-10-30T10:10:03Z

-                                       <AB>IF config.javaVersion.isAtLeast(JavaVersion.JAVA17)<BB>
-                                               <repository location="https://download.eclipse.org/releases/2024-12"/>
-                                       <AB>ELSE<BB>
-                                               <repository location="https://download.eclipse.org/releases/2023-03"/>
-                                       <AB>ENDIF<BB>
+                                       <repository location="https://download.eclipse.org/releases/2024-12"/>

LorenzoBettini · 2024-10-30T10:14:05Z

-                                       <AB>IF config.javaVersion.isAtLeast(JavaVersion.JAVA17)<BB>
-                                               <repository location="https://download.eclipse.org/releases/2024-12"/>
-                                       <AB>ELSE<BB>
-                                               <repository location="https://download.eclipse.org/releases/2023-03"/>
-                                       <AB>ENDIF<BB>
+                                       <repository location="https://download.eclipse.org/releases/2024-12"/>

Nice catch! Yes, that needs to be updated as well.

cdietrich · 2024-10-30T10:16:36Z

@LorenzoBettini i have a commit i can just push on your branch

LorenzoBettini · 2024-10-30T11:07:45Z

@LorenzoBettini i have a commit i can just push on your branch

Please go right ahead

cdietrich · 2024-10-30T11:09:09Z

done

cdietrich · 2024-10-31T15:10:34Z

My proposal is to bring this in. Update the reference projects.
Check the mwe and xpect builds and once these are green build a m2 milestone

wdyt @szarnekow @LorenzoBettini

LorenzoBettini · 2024-10-31T19:07:42Z

My proposal is to bring this in. Update the reference projects. Check the mwe and xpect builds and once these are green build a m2 milestone

wdyt @szarnekow @LorenzoBettini

I agree!

cdietrich · 2024-11-04T08:23:35Z

@szarnekow are you available this week?

LorenzoBettini · 2024-11-04T21:07:36Z

So we can build a milestone this week?

cdietrich · 2024-11-05T03:00:52Z

I really had hoped for Sebastian to have a look. If we want to bring it in and considering open points and my availability 2nd half of this week it needs to be asap

cdietrich · 2024-11-05T05:07:49Z

To check

org.eclipse.xtext.ui/src/org/eclipse/xtext/ui/util/JREContainerProvider.java
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/model/ManifestAccess.xtend

maybe

EMFGeneratorFragment2
complianceLevels in genmodels

szarnekow · 2024-11-13T09:16:24Z

org.eclipse.xtend.ide/META-INF/MANIFEST.MF

 org.eclipse.ui.ide;bundle-version="3.13.1",
 org.eclipse.ui.console;bundle-version="3.11.100",
- org.eclipse.core.filesystem;bundle-version="1.9.300",
+ org.eclipse.core.filesystem;bundle-version="1.10.300",
 org.eclipse.jdt.ui;bundle-version="3.26.0",


We should try to be more consistent with the require bundle dependencies, e.g. jdt.ui 3.26 is unlikely to match jdt.core 3.37

@szarnekow I only updated the dependencies when there was a matching one in the dev BOM, IIRC.

In general, I'm OK with keeping in sync minimal versions for the same dependencies that we have in the BOM.
For the other ones, I'd like to avoid such a massive maintenance burden...

szarnekow · 2024-11-13T09:17:57Z

org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF

 org.eclipse.xtext.common.types.ui;bundle-version="2.37.0",
- org.eclipse.emf.common;bundle-version="2.24.0",
+ org.eclipse.emf.common;bundle-version="2.30.0",
 org.eclipse.xtext.ui;bundle-version="2.37.0",
 org.eclipse.xtext.ui.shared;bundle-version="2.37.0",
 org.eclipse.ui.editors;bundle-version="3.14.300",


Do you know whether there exists a utility that would update all require-bundle versions to match a selected target platform? cc @HannesWell @merks @iloveeclipse

Not that I know of, no.

Do you know whether there exists a utility that would update all require-bundle versions to match a selected target platform?

Would be nice small feature in manifest editor. We have something similar in the feature editor, so may be with some advanced copy/paste work this would be doable.

It would indeed be nice. E.g. API-Tools could suggest to use the current version from the TP as lower bound if the bundle has changed it's version.
Or if no internals are used at all API-Tools could even try to be smart and compute the lower bound from @since tags.

szarnekow · 2024-11-13T10:14:20Z

Minor pending things

org.eclipse.xtext.util.JavaRuntimeVersion.determineJavaVersion(String) should default to 17 and not 11
org.eclipse.xtext.ui.util.JREContainerProvider.PREFERRED_BREE
org.eclipse.xtext.xtext.generator.model.ManifestAccess.getContent()

cdietrich · 2024-11-20T08:12:24Z

created #3247 for the emf update

Also updated the byte code of Methods.class inside the testData.jar: it is now compiled with Java 17

Signed-off-by: Christian Dietrich <[email protected]>

LorenzoBettini requested review from cdietrich and szarnekow October 29, 2024 18:06

cdietrich added this to the Release_2.38 milestone Nov 11, 2024

szarnekow reviewed Nov 13, 2024

View reviewed changes

LorenzoBettini force-pushed the lb_java17 branch from 50c2bf8 to 0eb62fa Compare November 19, 2024 10:59

cdietrich mentioned this pull request Nov 22, 2024

Bump 2.38 and bootstrap xtend-maven-plugin #3248

Merged

LorenzoBettini mentioned this pull request Nov 26, 2024

org.eclipse.m2e.core requires Java 21 #3253

Closed

LorenzoBettini and others added 13 commits November 26, 2024 13:05

minimal tp 2024-03, removed older platforms

5773765

removed strict-jdk-11 profile

0a4b482

Wizard minimal Java version is 17

66fa6e9

Java 17 minimal requirement

bf4229a

updated strictfp tests

5c089c2

Also updated the byte code of Methods.class inside the testData.jar: it is now compiled with Java 17

updated EMF deps in BOM and MANIFESTs

0d8d75d

updated Eclipse deps in BOM and MANIFESTs

34fc3bb

updated project wizard tests

0c251d3

adapt target platform wizard

71b2496

remove no longer needed reflections

c5cf5ec

remove m2e reflection

ccfe593

adjust launches

e0a726d

Signed-off-by: Christian Dietrich <[email protected]>

updated wizard expectations

9b7f85a

LorenzoBettini force-pushed the lb_java17 branch from 0eb62fa to 9b7f85a Compare November 26, 2024 12:06

some more defaults changed to java 17

8b5474b

szarnekow approved these changes Nov 26, 2024

View reviewed changes

LorenzoBettini mentioned this pull request Nov 26, 2024

Additional fixes/cleanup for Java 21 #3257

Merged

LorenzoBettini merged commit 7ecb428 into main Nov 26, 2024
14 of 17 checks passed

LorenzoBettini deleted the lb_java17 branch November 26, 2024 17:06

Java 17 as minimal version, 2024-03 as minimal platform, updated BOM and minimal dependencies #3233

Java 17 as minimal version, 2024-03 as minimal platform, updated BOM and minimal dependencies #3233

Conversation

LorenzoBettini commented Oct 29, 2024

cdietrich commented Oct 29, 2024

LorenzoBettini commented Oct 29, 2024

cdietrich commented Oct 29, 2024 • edited Loading

LorenzoBettini commented Oct 29, 2024

cdietrich commented Oct 29, 2024

cdietrich commented Oct 29, 2024

cdietrich commented Oct 29, 2024

LorenzoBettini commented Oct 29, 2024

cdietrich commented Oct 29, 2024

LorenzoBettini commented Oct 29, 2024

cdietrich commented Oct 29, 2024 • edited Loading

LorenzoBettini commented Oct 29, 2024

cdietrich commented Oct 29, 2024

iloveeclipse commented Oct 29, 2024

github-actions bot commented Oct 29, 2024 • edited Loading

Test Results

HannesWell commented Oct 30, 2024

LorenzoBettini commented Oct 30, 2024

cdietrich commented Oct 30, 2024

cdietrich commented Oct 30, 2024

LorenzoBettini commented Oct 30, 2024

cdietrich commented Oct 30, 2024

LorenzoBettini commented Oct 30, 2024

cdietrich commented Oct 30, 2024

LorenzoBettini commented Oct 30, 2024

cdietrich commented Oct 30, 2024

cdietrich commented Oct 31, 2024

LorenzoBettini commented Oct 31, 2024

cdietrich commented Nov 4, 2024

LorenzoBettini commented Nov 4, 2024

cdietrich commented Nov 5, 2024

cdietrich commented Nov 5, 2024 • edited Loading

szarnekow Nov 13, 2024

Choose a reason for hiding this comment

LorenzoBettini Nov 13, 2024

Choose a reason for hiding this comment

szarnekow Nov 13, 2024 • edited Loading

Choose a reason for hiding this comment

merks Nov 13, 2024

Choose a reason for hiding this comment

iloveeclipse Nov 13, 2024

Choose a reason for hiding this comment

HannesWell Nov 20, 2024

Choose a reason for hiding this comment

szarnekow commented Nov 13, 2024

cdietrich commented Nov 20, 2024

cdietrich commented Oct 29, 2024 •

edited

Loading

cdietrich commented Oct 29, 2024 •

edited

Loading

github-actions bot commented Oct 29, 2024 •

edited

Loading

cdietrich commented Nov 5, 2024 •

edited

Loading

szarnekow Nov 13, 2024 •

edited

Loading