Merge pull request #185 from eclipse/cd_platformUpdateExp

[eclipse-xtext/xtext#1982] support for java 17
eclipse · Oct 10, 2022 · 78edf8b · 78edf8b
2 parents 72c11db + bc5aa70
commit 78edf8b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,7 +8,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'
     ])
   }
 

diff --git a/org.eclipse.xtext.maven.parent/org.eclipse.xtext.parent.launch b/org.eclipse.xtext.maven.parent/org.eclipse.xtext.parent.launch
@@ -17,6 +17,6 @@
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="true"/>
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
 <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.8"/>
+<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.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.xtext.parent}"/>
 </launchConfiguration>
diff --git a/org.eclipse.xtext.maven.parent/pom.xml b/org.eclipse.xtext.maven.parent/pom.xml
@@ -11,13 +11,13 @@
 	<properties>
 		<root-dir>${basedir}/..</root-dir>
 		<maven.version>3.6.0</maven.version>
-		<tycho-version>1.7.0</tycho-version>
+		<tycho-version>2.7.5</tycho-version>
 		<emf.version>2.20.0</emf.version>
 
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>ISO-8859-1</project.reporting.outputEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 		<maven.javadoc.opts></maven.javadoc.opts>
 		<upstreamBranch>master</upstreamBranch>

diff --git a/org.eclipse.xtext.maven.plugin/.classpath b/org.eclipse.xtext.maven.plugin/.classpath
@@ -19,7 +19,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">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/org.eclipse.xtext.maven.plugin/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.xtext.maven.plugin/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
 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.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml b/org.eclipse.xtext.maven.plugin/src/test/resources/it/generate/pom.xml
@@ -11,10 +11,10 @@
 		<upstreamBranch>master</upstreamBranch>
 		<JENKINS_URL>https://ci.eclipse.org/xtext</JENKINS_URL>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 		<xtext-version>2.29.0-SNAPSHOT</xtext-version>
-		<tycho-version>1.7.0</tycho-version>
+		<tycho-version>2.7.5</tycho-version>
 		<eclipse-text-version>3.6.100</eclipse-text-version>
 		<core-resources-version>3.12.0</core-resources-version>
 		<core-runtime-version>3.13.0</core-runtime-version>

diff --git a/...clipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/pom.xml b/...clipse.xtext.maven.plugin/src/test/resources/it/generate/xcore-mapping/sample.emf/pom.xml
@@ -65,6 +65,7 @@
 					<!-- This does not work currently, as we can see by the missing lambda 
 						in generated code for GreetingsHelper.compileAllGreetings(). It does work, 
 						however, for xtend-maven-plugin. (see https://github.com/eclipse/xtext-maven/issues/11) -->
+						<!-- TODO JAVA11 -->
 					<javaSourceVersion>1.8</javaSourceVersion>
 					<projectMappings>
 						<projectMapping>