Support for Java 21 #3037

LorenzoBettini · 2024-05-14T19:03:42Z

Addresses most of #2686

LorenzoBettini · 2024-05-14T19:15:53Z

A few comments:

Basically the support of Java 21 from JDT is automatic in Eclipse, taking the latest version of JDT; however, this https://github.com/eclipse/xtext/pull/3037/files#diff-829bb66211b81ee8e7e87794e1319b00452a80ff6916b8feeead5d7e72e6e27eR157 is also required when we use the JDT parser to parse Java files, so that we can correctly detect Java records; that method was introduced in JDT several versions ago, so that's harmless: for sure, it's present in our minimal required version of JDT.
Concerning Maven the BOM has a profile using the new version of JDT core. I found out that a profile in a BOM CANNOT be activated explicitly with -P; in fact, a profile must be present in the aggregator or parent to be explicitly activated. However, good news, a profile in a BOM can still be implicitly activated through a System property! E.g., either at the command line or through the file ".mvn/maven.config" as I do in the IT projects of our Maven plugins, e.g., https://github.com/eclipse/xtext/pull/3037/files#diff-b9a50ce2dde853da7188fbdbf5eac95cf0259c51d108b42360bd1a7dbfda555bR1 For the profile I chose the name java-21 and the same for the property; if you prefer some other names, please let me know
I also added a CLI Wizard test for Java 21. I don't know whether it's worthwhile, wdyt?
As for the rest, it's mostly related to added tests, activated when the runtime is Java 21. I took the chance to refactor a bit standalone incremental builder tests.

One further possibility for Maven projects when selecting Java 21 in the wizard would be to generate the".mvn/maven.config" file. However, I seem to understand that this solution is temporary anyway: when we switch to Java 17 as the minimal requirement, the BOM profile is not needed anymore.

LorenzoBettini · 2024-05-14T19:17:56Z

Another small note: the GitHub Actions build-maven-artifacts uses Java 21; while for the full builds there's only an Ubuntu job for Java 21.

cdietrich · 2024-05-15T04:24:26Z

what are the org.eclipse.draw2d changes for?

LorenzoBettini · 2024-05-15T04:26:18Z

what are the org.eclipse.draw2d changes for?

It's documented in the tests: it's to access a java record from an existing library. JDK itself doesn't provide any in my findings.

cdietrich · 2024-05-15T04:51:38Z

there are some rare ones e.g.

UnixDomainPrincipal one in MXBean

LorenzoBettini · 2024-05-15T06:01:02Z

UnixDomainPrincipal

But is that available on all platforms?

I felt safer using something like the one from draw2d, which is in our target platform anyway.

It's a temporary solution until we use Java 21 in Eclipse.

However, I have to remove the lower bound to let it also build with the older platform: in Jenkins, it cannot resolve the latest draw2d

LorenzoBettini · 2024-05-15T06:12:11Z

@cdietrich I removed the lower bound for draw2d to let the build work also on older target platform.

Of course, if you don't like this temporary solution I can also try with UnixDomainPrincipal

cdietrich · 2024-05-15T06:23:22Z

maybe now that we are in a monorepo. maybe we can reconsider a single testdata bundle for jvm stuff
@szarnekow wdyt

LorenzoBettini · 2024-05-15T06:30:47Z

maybe now that we are in a monorepo. maybe we can reconsider a single testdata bundle for jvm stuff @szarnekow wdyt

I think we already have something like that: org.eclipse.xtext.xbase.testdata.
But I couldn't add a Java record there: it wouldn't compile unless we always use Java 21.

That's why I was considering mine as a temporary solution.

cdietrich · 2024-05-15T06:34:10Z

i see. maybe we use draw2d for now and something else later.

LorenzoBettini · 2024-05-15T06:38:38Z

i see. maybe we use draw2d for now and something else later.

Yes, that's what I was proposing as well.

LorenzoBettini · 2024-05-15T07:28:15Z

Argh! There's a compilation failure in Jenkins:

08:40:36  [ERROR] Failed to execute goal org.eclipse.tycho:tycho-compiler-plugin:4.0.7:compile (default-compile) on project org.eclipse.xtext.xbase.ui.tests: Compilation failure: Compilation failure: 
08:40:36  [ERROR] /home/jenkins/agent/workspace/xtext_PR-3037/org.eclipse.xtext.xbase.ui.tests/src/org/eclipse/xtext/xbase/ui/tests/JavaVersionExtendedTest.java:[32] 
08:40:36  [ERROR] 	assertEquals(ClassFileConstants.JDK21, JavaVersion.JAVA21.toJdtClassFileConstant());
08:40:36  [ERROR] 	                                ^^^^^
08:40:36  [ERROR] JDK21 cannot be resolved or is not a field

We're using an old version of JDT in that old target platform...

cdietrich · 2024-05-15T07:32:09Z

this is why we in the past partially used reflection

LorenzoBettini · 2024-05-15T07:33:50Z

this is why we in the past partially used reflection

Let's see whether this 6ec2a2f makes it happy.
Again, temporary solution, which I'll start to keep track in #2686

szarnekow · 2024-05-16T08:18:05Z

org.eclipse.xtend.maven.plugin/Run ITs from Maven.launch

@@ -22,6 +22,5 @@
    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/"/>


Interesting to see what we still had in some of the config files.

At least for the moment...

The profile must be activated through the system property "java-21" either on the command line "-Djava-21", or by creating the file "maven.config" inside the folder ".mvn" at the root of the project, with the content "-Djava-21"

To allow for builds with older target platforms

To let it compile with older target platforms

cdietrich · 2024-05-17T11:08:58Z

@LorenzoBettini doesnt https://ci.eclipse.org/xtext/job/xtext-monorepo-full-deploy-nightly/ start automatically anymore?

LorenzoBettini · 2024-05-17T12:30:22Z

@cdietrich It is triggered by https://ci.eclipse.org/xtext/job/xtext/job/main/ upon success build.

It has built: https://ci.eclipse.org/xtext/job/xtext-monorepo-full-deploy-nightly/273/

Of course, slowness of JIRO doesn't help ;)

cdietrich · 2024-05-17T13:03:19Z

@LorenzoBettini i started it manually
this is why i am asking

cdietrich · 2024-05-17T13:56:51Z

@LorenzoBettini runniing

JavaSourceLanguageTest with the record i dont see
org.eclipse.xtext.java.resource.JavaDerivedStateComputer.createType(TypeDeclaration, String)
called

LorenzoBettini · 2024-05-17T14:03:18Z

@LorenzoBettini i started it manually this is why i am asking

That's strange... indeed I see in the main job

14:21:00  Stage "Trigger Snapshot Deployment" skipped due to when conditional

LorenzoBettini · 2024-05-17T14:09:41Z

@LorenzoBettini i started it manually this is why i am asking

That's strange... indeed I see in the main job
14:21:00  Stage "Trigger Snapshot Deployment" skipped due to when conditional

It worked yesterday though: https://ci.eclipse.org/xtext/job/xtext/job/main/1138/console

LorenzoBettini · 2024-05-17T14:23:15Z

@LorenzoBettini runniing

JavaSourceLanguageTest with the record i dont see org.eclipse.xtext.java.resource.JavaDerivedStateComputer.createType(TypeDeclaration, String) called

But the test succeeds and the corresponding class is found.
What do you mean?

cdietrich · 2024-05-17T14:29:51Z

@LorenzoBettini this test wll do nothing.
as org.eclipse.xtext.java.resource.JavaDerivedStateComputer.installStubs(Resource)
will swallow all problems
and not produce a type

cdietrich · 2024-05-17T14:32:31Z

cdietrich · 2024-05-17T14:33:53Z

=> maybe a installFull vs installStub thing

cdietrich · 2024-05-17T14:35:08Z

gralde trace

       at org.eclipse.xtext.java.resource.JavaDerivedStateComputer.createType(JavaDerivedStateComputer.java:130)
        at org.eclipse.xtext.java.resource.JavaDerivedStateComputer.installStubs(JavaDerivedStateComputer.java:107)
        at org.eclipse.xtext.java.resource.JavaResource.lambda$0(JavaResource.java:179)
        at org.eclipse.xtext.java.resource.JavaResource.initializing(JavaResource.java:195)
        at org.eclipse.xtext.java.resource.JavaResource.installStubs(JavaResource.java:178)
        at org.eclipse.xtext.java.resource.JavaResourceDescriptionManager.getResourceDescription(JavaResourceDescriptionManager.java:48)

cdietrich · 2024-05-17T14:37:14Z

no j21 here

cdietrich · 2024-05-17T14:38:13Z

JavaConfig javaConfig = new JavaConfig();
javaConfig.setJavaSourceLevel(JavaVersion.JAVA21);
javaConfig.setJavaTargetLevel(JavaVersion.JAVA21);
javaConfig.attachToEmfObject(rs);

called too late and should be moved into this.resourceSet

cdietrich · 2024-05-17T16:04:22Z

see https://github.com/eclipse/xtext/compare/cd-java-source-lang-21?expand=1

LorenzoBettini requested review from szarnekow and cdietrich May 14, 2024 19:18

szarnekow reviewed May 16, 2024

View reviewed changes

szarnekow approved these changes May 16, 2024

View reviewed changes

LorenzoBettini force-pushed the lb_java_21-2 branch 2 times, most recently from 9a8e43d to 8e4c424 Compare May 16, 2024 12:15

LorenzoBettini mentioned this pull request May 16, 2024

bump jetty to 11.0.21 #3041

Merged

LorenzoBettini added 9 commits May 16, 2024 20:43

build-maven-artifacts Java 21

c8d4740

At least for the moment...

maven.compiler.target 21 in Java 21 profile

09367df

JAVA21 in JavaVersion enum

ba104e8

added wizard integration test for Java 21

bcad9a9

ASTParser.newParser(AST.getJLSLatest());

a5bae6d

test for Java 21 record in xtext.java.tests

96d8bb8

updated wizard expectation for Java 21 for new classgraph

b490571

updated wizard expectation for Java 21 for new mwe2

d4cd0f1

Java21RecordCompilerTest in xbase.tests

c08cf7b

LorenzoBettini added 11 commits May 16, 2024 20:43

removed the JRE from launches so that it takes the workspace one

867e5ed

JDT 3.37.0 in the BOM when using Java 21

416e01b

removed the JRE from launches so that it takes the workspace one

37f4dfa

First test of xtend-maven-plugin accessing a Java record

8e16108

Xtend validation test overriding Java record (final)

7993912

JDT 3.37.0 in the BOM profile to be activated explicitly

103079b

The profile must be activated through the system property "java-21" either on the command line "-Djava-21", or by creating the file "maven.config" inside the folder ".mvn" at the root of the project, with the content "-Djava-21"

extracted common code for incremental standalone builder tests

1eb0c6b

removed lower bound on org.eclipse.draw2d

6cfdc4f

To allow for builds with older target platforms

hardcoded ClassFileConstants.JDK21

cc880a1

To let it compile with older target platforms

updated wizard expectation for Java 21 project

c46acc9

added wizard integration test for Java 21

8f6d1a3

LorenzoBettini force-pushed the lb_java_21-2 branch from 8e4c424 to 8f6d1a3 Compare May 16, 2024 18:46

LorenzoBettini added this to the Release_2.35 milestone May 17, 2024

LorenzoBettini merged commit 83e6497 into eclipse:main May 17, 2024
7 checks passed

LorenzoBettini deleted the lb_java_21-2 branch May 17, 2024 05:13

cdietrich mentioned this pull request May 17, 2024

fix java source lang record handling #3048

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for Java 21 #3037

Support for Java 21 #3037

LorenzoBettini commented May 14, 2024

LorenzoBettini commented May 14, 2024

LorenzoBettini commented May 14, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

szarnekow May 16, 2024

cdietrich commented May 17, 2024

LorenzoBettini commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

LorenzoBettini commented May 17, 2024

LorenzoBettini commented May 17, 2024

LorenzoBettini commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024 •

edited

cdietrich commented May 17, 2024

Support for Java 21 #3037

Support for Java 21 #3037

Conversation

LorenzoBettini commented May 14, 2024

LorenzoBettini commented May 14, 2024

LorenzoBettini commented May 14, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

LorenzoBettini commented May 15, 2024

cdietrich commented May 15, 2024

LorenzoBettini commented May 15, 2024

szarnekow May 16, 2024

Choose a reason for hiding this comment

cdietrich commented May 17, 2024

LorenzoBettini commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

LorenzoBettini commented May 17, 2024

LorenzoBettini commented May 17, 2024

LorenzoBettini commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024 • edited

cdietrich commented May 17, 2024

cdietrich commented May 17, 2024 •

edited