Merge pull request #472 from eclipse/cd_platformUpdateExp

[eclipse/xtext#1982] support for java 17
eclipse · Oct 10, 2022 · 25c518b · 25c518b
2 parents a6a388e + 6804cd2
commit 25c518b
Show file tree

Hide file tree

Showing 26 changed files with 68 additions and 63 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
   parameters {
     // see https://wiki.eclipse.org/Jenkins#JDK
     choice(name: 'JDK_VERSION', description: 'Which JDK should be used?', choices: [
-       'temurin-jdk8-latest', 'temurin-jdk11-latest', 'temurin-jdk17-latest'
+       'temurin-jdk11-latest', 'temurin-jdk17-latest'
     ])
     booleanParam(
       name: 'TRIGGER_DOWNSTREAM_BUILD', 

diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 }
 
 plugins {
-  id 'org.ajoberstar.grgit' version '4.1.1'
+  id 'org.ajoberstar.grgit' version '5.0.0'
 }
 
 apply from: "${rootDir}/gradle/versions.gradle"
@@ -42,7 +42,6 @@ subprojects {
 		}
 		apply plugin: 'eclipse'
 
-
 		apply from: "${rootDir}/gradle/java-compiler-settings.gradle"
 		apply from: "${rootDir}/gradle/xtend-compiler-settings.gradle"
 		apply from: "${rootDir}/gradle/maven-deployment.gradle"

diff --git a/gradle/java-compiler-settings.gradle b/gradle/java-compiler-settings.gradle
@@ -2,7 +2,7 @@
  * Configuration of Java compiler, Javadoc, additional archives, and additional dependency configurations.
  */
 
-sourceCompatibility = '1.8'
+sourceCompatibility = '11'
 
 tasks.withType(JavaCompile) {
 	options.encoding = 'ISO-8859-1'

diff --git a/org.eclipse.xtend.lib.gwt.test/.classpath b/org.eclipse.xtend.lib.gwt.test/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtend.lib.gwt.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.gwt.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtend.lib.gwt/.classpath b/org.eclipse.xtend.lib.gwt/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtend.lib.gwt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.gwt/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtend.lib.gwt/META-INF/MANIFEST.MF b/org.eclipse.xtend.lib.gwt/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.xtend.lib.gwt
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 2.29.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtend.lib
 Require-Bundle: org.eclipse.xtend.lib
 Automatic-Module-Name: org.eclipse.xtend.lib.gwt

diff --git a/org.eclipse.xtend.lib.macro/.classpath b/org.eclipse.xtend.lib.macro/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtend.lib.macro/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.macro/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF b/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.xtend.lib.macro
 Bundle-Name: Xtend Macro Interfaces
 Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.29.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtend.lib.macro;version="2.29.0";uses:="org.eclipse.xtend.lib.macro.file,org.eclipse.xtend.lib.macro.services,org.eclipse.xtend.lib.macro.declaration",
  org.eclipse.xtend.lib.macro.declaration;version="2.29.0";uses:="org.eclipse.xtend.lib.macro.file,  org.eclipse.xtend2.lib,  org.eclipse.xtend.lib.macro.expression,  org.eclipse.xtext.xbase.lib",
  org.eclipse.xtend.lib.macro.expression;version="2.29.0";uses:="org.eclipse.xtend.lib.macro.declaration",

diff --git a/org.eclipse.xtend.lib.tests/.classpath b/org.eclipse.xtend.lib.tests/.classpath
@@ -14,7 +14,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtend.lib.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtend.lib/.classpath b/org.eclipse.xtend.lib/.classpath
@@ -18,7 +18,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtend.lib/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtend.lib/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtend.lib/META-INF/MANIFEST.MF b/org.eclipse.xtend.lib/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.xtend.lib
 Bundle-Name: Xtend Runtime Library
 Bundle-Vendor: Eclipse Xtext
 Bundle-Version: 2.29.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtend.lib;version="2.29.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend.lib.macro",
  org.eclipse.xtend.lib.annotations;version="2.29.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend2.lib,org.eclipse.xtend.lib.macro"
 Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.29.0";visibility:=reexport,

diff --git a/org.eclipse.xtext.dev-bom/build.gradle b/org.eclipse.xtext.dev-bom/build.gradle
@@ -1,5 +1,11 @@
 plugins {
     id 'java-platform'
+    id 'com.github.ben-manes.versions' version '0.39.0'
+}
+apply plugin: "com.github.ben-manes.versions"
+
+tasks.dependencyUpdates {
+    checkConstraints = true
 }
 
 group = 'org.eclipse.xtext'
@@ -31,11 +37,11 @@ dependencies {
         api "org.eclipse.emf:org.eclipse.emf.mwe2.launch:2.13.0"
         api "org.eclipse.emf:org.eclipse.emf.mwe2.lib:2.13.0"
         api "org.eclipse.emf:org.eclipse.emf.mwe2.runtime:2.13.0"
-        api "org.eclipse.jdt:org.eclipse.jdt.compiler.apt:1.3.1100"
-        api "org.eclipse.jdt:org.eclipse.jdt.compiler.tool:1.2.1000"
-        api "org.eclipse.jdt:org.eclipse.jdt.core:3.23.0"
-        api "org.eclipse.jdt:org.eclipse.jdt.debug:3.16.0"
-        api "org.eclipse.jdt:org.eclipse.jdt.launching:3.18.0"
+        api "org.eclipse.jdt:org.eclipse.jdt.compiler.apt:1.4.200"
+        api "org.eclipse.jdt:org.eclipse.jdt.compiler.tool:1.3.200"
+        api "org.eclipse.jdt:org.eclipse.jdt.core:3.31.0"
+        api "org.eclipse.jdt:org.eclipse.jdt.debug:3.19.300"
+        api "org.eclipse.jdt:org.eclipse.jdt.launching:3.19.700"
         /*
         When adjusting the `lsp4j` version here, do not forget to do the following: 
         - Update the versions in the 
@@ -50,21 +56,21 @@ dependencies {
         api "org.eclipse.lsp4j:org.eclipse.lsp4j.websocket.jakarta:0.16.0"
         api "org.eclipse.lsp4j:org.eclipse.lsp4j.websocket:0.16.0"
         api "org.eclipse.lsp4j:org.eclipse.lsp4j:0.16.0"
-        api "org.eclipse.platform:org.eclipse.core.commands:3.9.700"
-        api "org.eclipse.platform:org.eclipse.core.contenttype:3.7.800"
-        api "org.eclipse.platform:org.eclipse.core.expressions:3.7.0"
-        api "org.eclipse.platform:org.eclipse.core.filesystem:1.7.700"
-        api "org.eclipse.platform:org.eclipse.core.jobs:3.10.800"
-        api "org.eclipse.platform:org.eclipse.core.resources:3.13.800"
-        api "org.eclipse.platform:org.eclipse.core.runtime:3.19.0"
-        api "org.eclipse.platform:org.eclipse.core.variables:3.4.800"
-        api "org.eclipse.platform:org.eclipse.debug.core:3.16.0"
-        api "org.eclipse.platform:org.eclipse.equinox.app:1.5.0"
-        api "org.eclipse.platform:org.eclipse.equinox.common:3.13.0"
-        api "org.eclipse.platform:org.eclipse.equinox.preferences:3.8.0"
-        api "org.eclipse.platform:org.eclipse.equinox.registry:3.9.0"
-        api "org.eclipse.platform:org.eclipse.osgi:3.16.0"
-        api "org.eclipse.platform:org.eclipse.text:3.10.300"
+        api "org.eclipse.platform:org.eclipse.core.commands:3.10.200"
+        api "org.eclipse.platform:org.eclipse.core.contenttype:3.8.200"
+        api "org.eclipse.platform:org.eclipse.core.expressions:3.8.200"
+        api "org.eclipse.platform:org.eclipse.core.filesystem:1.9.500"
+        api "org.eclipse.platform:org.eclipse.core.jobs:3.13.100"
+        api "org.eclipse.platform:org.eclipse.core.resources:3.18.0"
+        api "org.eclipse.platform:org.eclipse.core.runtime:3.26.0"
+        api "org.eclipse.platform:org.eclipse.core.variables:3.5.100"
+        api "org.eclipse.platform:org.eclipse.debug.core:3.20.0"
+        api "org.eclipse.platform:org.eclipse.equinox.app:1.6.200"
+        api "org.eclipse.platform:org.eclipse.equinox.common:3.16.200"
+        api "org.eclipse.platform:org.eclipse.equinox.preferences:3.10.100"
+        api "org.eclipse.platform:org.eclipse.equinox.registry:3.11.200"
+        api "org.eclipse.platform:org.eclipse.osgi:3.18.100"
+        api "org.eclipse.platform:org.eclipse.text:3.12.200"
         api "org.eclipse.xpand:org.eclipse.xpand:2.0.0"
         api "org.eclipse.xpand:org.eclipse.xtend.typesystem.emf:2.0.0"
         api "org.eclipse.xpand:org.eclipse.xtend:2.0.0"

diff --git a/org.eclipse.xtext.xbase.lib.gwt/.classpath b/org.eclipse.xtext.xbase.lib.gwt/.classpath
@@ -6,7 +6,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtext.xbase.lib.gwt/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.lib.gwt/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.xbase.lib.gwt
 Bundle-Version: 2.29.0.qualifier
 Export-Package: org.eclipse.xtend2.lib,
  org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)"
 Bundle-Vendor: %Vendor-Name
 Automatic-Module-Name: org.eclipse.xtext.xbase.lib.gwt

diff --git a/org.eclipse.xtext.xbase.lib.tests/.classpath b/org.eclipse.xtext.xbase.lib.tests/.classpath
@@ -14,7 +14,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtext.xbase.lib.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.lib.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtext.xbase.lib/.classpath b/org.eclipse.xtext.xbase.lib/.classpath
@@ -12,7 +12,7 @@
 			<attribute name="gradle_used_by_scope" value="main,test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
+	<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.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>
diff --git a/org.eclipse.xtext.xbase.lib/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.xbase.lib/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF b/org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Xbase Runtime Library
 Bundle-SymbolicName: org.eclipse.xtext.xbase.lib
 Bundle-Version: 2.29.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.xtend2.lib;version="2.29.0",
  org.eclipse.xtext.xbase.lib;version="2.29.0",
  org.eclipse.xtext.xbase.lib.internal;x-internal:="true",

diff --git a/releng/pom.xml b/releng/pom.xml
@@ -9,8 +9,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>	
-		<tycho-version>1.7.0</tycho-version>
-		<root-dir>${basedir}/..</root-dir>
+		<tycho-version>2.7.5</tycho-version>
+		<root-dir>${maven.multiModuleProjectDirectory}/..</root-dir>
 	</properties>
 
 	<repositories>