Merge branch 'eclipse:main' into main

mehmet-karaman · Nov 27, 2024 · 952acd6 · 952acd6
2 parents 6668436 + 4eebe72
commit 952acd6
Show file tree

Hide file tree

Showing 702 changed files with 3,591 additions and 5,998 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,14 +6,14 @@ pipeline {
   }
 
   parameters {
-    choice(name: 'TARGET_PLATFORM', choices: ['r202203', 'r202206', 'r202209', 'r202212', 'r202303', 'r202306', 'r202309', 'r202312', 'r202403', 'r202406', 'r202409', 'latest'], description: 'Which Target Platform should be used?')
+    choice(name: 'TARGET_PLATFORM', choices: ['r202403', 'r202406', 'r202409', 'r202412', 'latest'], description: 'Which Target Platform should be used?')
     // see https://wiki.eclipse.org/Jenkins#JDK
-    choice(name: 'JDK_VERSION', choices: [ '11', '17', '21' ], description: 'Which JDK version should be used?')
+    choice(name: 'JDK_VERSION', choices: [ '17', '21' ], description: 'Which JDK version should be used?')
   }
 
   triggers {
     parameterizedCron(env.BRANCH_NAME == 'main' ? '''
-      H H(0-1) * * * %TARGET_PLATFORM=r202203;JDK_VERSION=17
+      H H(0-1) * * * %TARGET_PLATFORM=r202403;JDK_VERSION=17
       H H(3-4) * * * %TARGET_PLATFORM=latest;JDK_VERSION=21
       ''' : '')
   }
@@ -59,15 +59,13 @@ pipeline {
       environment {
         MAVEN_OPTS = "-Xmx1500m"
         // set all Java versions needed by our toolchains.xml
-        JAVA_HOME_11_X64 = tool(type:'jdk', name:'temurin-jdk11-latest')
         JAVA_HOME_17_X64 = tool(type:'jdk', name:'temurin-jdk17-latest')
         JAVA_HOME_21_X64 = tool(type:'jdk', name:'temurin-jdk21-latest')
       }
       steps {
         xvnc(useXauthority: true) {
           sh """
             ./full-build.sh --tp=${selectedTargetPlatform()} \
-              ${javaVersion() == 11 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-11' : ''} \
               ${javaVersion() == 17 ? '--toolchains releng/toolchains.xml -Pstrict-jdk-17' : ''} \
               ${javaVersion() == 21 ? '-Pstrict-jdk-21' : ''}
           """
@@ -166,20 +164,20 @@ def eclipseVersion() {
 
 /**
  * The target platform is primarily defined by the build parameter TARGET_PLATFORM.
- * But when the build is triggered by upstream with at least Java version 11, 'latest'
+ * But when the build is triggered by upstream with at least Java version 21, 'latest'
  * is returned.
  */
 def selectedTargetPlatform() {
     def tp = params.TARGET_PLATFORM
     def isUpstream = isTriggeredByUpstream()
     def javaVersion = javaVersion()
 
-    if (isTriggeredByUpstream() && javaVersion>=17) {
+    if (isTriggeredByUpstream() && javaVersion>=21) {
         println("Choosing 'latest' target since this build was triggered by upstream with Java ${javaVersion}")
         return 'latest'
-    } else if (isTriggeredByUpstream() && javaVersion>=11) {
-        println("Choosing 'r202203' target since this build was triggered by upstream with Java ${javaVersion}")
-        return 'r202203'
+    } else if (isTriggeredByUpstream() && javaVersion>=17) {
+        println("Choosing 'r2024-03' target since this build was triggered by upstream with Java ${javaVersion}")
+        return 'r2024-03'
     } else {
         return tp
     }

diff --git a/full-build.sh b/full-build.sh
@@ -17,7 +17,7 @@ while [ "$1" != "" ]; do
       echo -e "\t-h --help"
       echo -e "\t--no-tests Skip test execution"
       echo -e "\t--local-repository=<PATH> Use local Maven repository"
-      echo -e "\t--tp=$TARGET_PLATFORM (valid values: r202203,r202206,...,latest)"
+      echo -e "\t--tp=$TARGET_PLATFORM (valid values: r2024-03,r2024-06,...,latest)"
       echo ""
       exit
       ;;

diff --git a/full-deploy.sh b/full-deploy.sh
@@ -17,7 +17,7 @@ while [ "$1" != "" ]; do
       echo -e "\t-h --help"
       echo -e "\t--no-tests Skip test execution"
       echo -e "\t--local-repository=<PATH> Use local Maven repository"
-      echo -e "\t--tp=$TARGET_PLATFORM (valid values: r202203,r202206,...,latest)"
+      echo -e "\t--tp=$TARGET_PLATFORM (valid values: r2024-03,r2024-06,...,latest)"
       echo ""
       exit
       ;;

diff --git a/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml b/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.xtext</groupId>
 		<artifactId>org.eclipse.xtext.nodeploy.parent</artifactId>
-		<version>2.37.0-SNAPSHOT</version>
+		<version>2.38.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.xtext.nodeploy.parent</relativePath>
 	</parent>
 	<packaging>eclipse-feature</packaging>

diff --git a/org.eclipse.xtend.core.tests/.classpath b/org.eclipse.xtend.core.tests/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src">
 		<attributes>

diff --git a/org.eclipse.xtend.core.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -127,7 +127,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

diff --git a/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Xtend Core Tests
 Bundle-SymbolicName: org.eclipse.xtend.core.tests
-Bundle-Version: 2.37.0.qualifier
+Bundle-Version: 2.38.0.qualifier
 Bundle-Vendor: Eclipse Xtext
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.eclipse.xtend.core;bundle-version="2.37.0",
- org.eclipse.xtext.testing;bundle-version="2.37.0",
- org.eclipse.xtext.xbase.testing;bundle-version="2.37.0",
- org.eclipse.xtext;bundle-version="2.37.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.37.0",
- org.eclipse.xtext.xbase.ui;bundle-version="2.37.0",
+Bundle-RequiredExecutionEnvironment: JavaSE-17
+Require-Bundle: org.eclipse.xtend.core;bundle-version="2.38.0",
+ org.eclipse.xtext.testing;bundle-version="2.38.0",
+ org.eclipse.xtext.xbase.testing;bundle-version="2.38.0",
+ org.eclipse.xtext;bundle-version="2.38.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.38.0",
+ org.eclipse.xtext.xbase.ui;bundle-version="2.38.0",
  org.hamcrest.core;bundle-version="1.1.0",
- org.eclipse.core.runtime;bundle-version="3.24.100",
- org.eclipse.equinox.common;bundle-version="3.16.0",
- org.eclipse.emf.codegen.ecore;bundle-version="2.29.0",
- org.eclipse.core.resources;bundle-version="3.16.100",
+ org.eclipse.core.runtime;bundle-version="3.31.0",
+ org.eclipse.equinox.common;bundle-version="3.19.0",
+ org.eclipse.emf.codegen.ecore;bundle-version="2.37.0",
+ org.eclipse.core.resources;bundle-version="3.20.100",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.builder;bundle-version="2.37.0",
- org.eclipse.xtend.lib;bundle-version="2.37.0",
+ org.eclipse.xtext.builder;bundle-version="2.38.0",
+ org.eclipse.xtend.lib;bundle-version="2.38.0",
  org.objectweb.asm;bundle-version="[9.7.1,9.8.0)",
- org.eclipse.jdt.core;bundle-version="3.29.0",
- org.eclipse.xtext.builder.standalone;bundle-version="2.37.0",
- org.eclipse.xtext.java;bundle-version="2.37.0",
+ org.eclipse.jdt.core;bundle-version="3.37.0",
+ org.eclipse.xtext.builder.standalone;bundle-version="2.38.0",
+ org.eclipse.xtext.java;bundle-version="2.38.0",
  org.eclipse.draw2d
 Import-Package: jakarta.inject;version="2.0.1",
  org.apache.log4j;version="1.2.24",
@@ -34,46 +34,46 @@ Import-Package: jakarta.inject;version="2.0.1",
  org.junit.runner;version="4.13.2",
  org.junit.runners;version="4.13.2"
 Bundle-ClassPath: .
-Export-Package: .;version="2.37.0";x-internal:=true,
- bug380058;version="2.37.0";x-internal:=true,
- bug396879;version="2.37.0";x-internal:=true,
- bug400807;version="2.37.0";x-internal:=true,
- bug406086.def;version="2.37.0";x-internal:=true,
- bug413824;version="2.37.0";x-internal:=true,
- bug417675;version="2.37.0";x-internal:=true,
- bug424839;version="2.37.0";x-internal:=true,
- bug424839.sub;version="2.37.0";x-internal:=true,
- compound;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests;version="2.37.0";x-friends:="org.eclipse.xtend.performance.tests",
- org.eclipse.xtend.core.tests.annotations;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.compiler;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.compiler.batch;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.conversion;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.debug;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.dispatch;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.formatting;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.imports;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.javadoc;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.jvmmodel;version="2.37.0",
- org.eclipse.xtend.core.tests.lib;version="2.37.0",
- org.eclipse.xtend.core.tests.linking;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.macro;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.macro.declaration;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.naming;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.parser;version="2.37.0",
- org.eclipse.xtend.core.tests.parsing;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.resource;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.richstring;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.serializer;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.smoke;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.typesystem;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.typing;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.validation;version="2.37.0";x-internal:=true,
- org.eclipse.xtend.core.tests.xtend.impl;version="2.37.0";x-internal:=true,
- overloading;version="2.37.0";x-internal:=true,
- selftypes;version="2.37.0";x-internal:=true,
- test;version="2.37.0";x-internal:=true,
- testclazzes;version="2.37.0";x-internal:=true,
- types;version="2.37.0";x-internal:=true,
- types.override;version="2.37.0";x-internal:=true
+Export-Package: .;version="2.38.0";x-internal:=true,
+ bug380058;version="2.38.0";x-internal:=true,
+ bug396879;version="2.38.0";x-internal:=true,
+ bug400807;version="2.38.0";x-internal:=true,
+ bug406086.def;version="2.38.0";x-internal:=true,
+ bug413824;version="2.38.0";x-internal:=true,
+ bug417675;version="2.38.0";x-internal:=true,
+ bug424839;version="2.38.0";x-internal:=true,
+ bug424839.sub;version="2.38.0";x-internal:=true,
+ compound;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests;version="2.38.0";x-friends:="org.eclipse.xtend.performance.tests",
+ org.eclipse.xtend.core.tests.annotations;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.compiler;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.compiler.batch;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.conversion;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.debug;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.dispatch;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.formatting;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.imports;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.javadoc;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.jvmmodel;version="2.38.0",
+ org.eclipse.xtend.core.tests.lib;version="2.38.0",
+ org.eclipse.xtend.core.tests.linking;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.macro;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.macro.declaration;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.naming;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.parser;version="2.38.0",
+ org.eclipse.xtend.core.tests.parsing;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.resource;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.richstring;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.serializer;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.smoke;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.typesystem;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.typing;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.validation;version="2.38.0";x-internal:=true,
+ org.eclipse.xtend.core.tests.xtend.impl;version="2.38.0";x-internal:=true,
+ overloading;version="2.38.0";x-internal:=true,
+ selftypes;version="2.38.0";x-internal:=true,
+ test;version="2.38.0";x-internal:=true,
+ testclazzes;version="2.38.0";x-internal:=true,
+ types;version="2.38.0";x-internal:=true,
+ types.override;version="2.38.0";x-internal:=true
 Automatic-Module-Name: org.eclipse.xtend.core.tests
diff --git a/org.eclipse.xtend.core.tests/pom.xml b/org.eclipse.xtend.core.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.xtext</groupId>
 		<artifactId>org.eclipse.xtext.nodeploy.parent</artifactId>
-		<version>2.37.0-SNAPSHOT</version>
+		<version>2.38.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.xtext.nodeploy.parent</relativePath>
 	</parent>
 	<groupId>org.eclipse.xtend</groupId>

diff --git a/org.eclipse.xtend.core.tests/xtend.core.tests(xtend).launch b/org.eclipse.xtend.core.tests/xtend.core.tests(xtend).launch
@@ -25,7 +25,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <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-11"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -pluginCustomization ../../releng/org.eclipse.xtext.releng/plugin_customization.ini"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtend.core.tests"/>

diff --git a/org.eclipse.xtend.core.tests/xtend.core.tests.launch b/org.eclipse.xtend.core.tests/xtend.core.tests.launch
@@ -25,7 +25,7 @@
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <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-11"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -pluginCustomization ../../releng/org.eclipse.xtext.releng/plugin_customization.ini"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.xtend.core.tests"/>

diff --git a/org.eclipse.xtend.core/.classpath b/org.eclipse.xtend.core/.classpath
@@ -19,7 +19,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="deprecated"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.xtend.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.core/.settings/org.eclipse.jdt.core.prefs
@@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nonnullisdefault=disabled
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16