GLSP-1127: Update to Java17 as minimum version

Fixes eclipse-glsp/glsp/issues/1127
eclipse-glsp · Oct 11, 2023 · afa6f4a · afa6f4a
1 parent 14e5a20
commit afa6f4a
Show file tree

Hide file tree

Showing 13 changed files with 415 additions and 450 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,7 @@ kind: Pod
 spec:
   containers:
   - name: ci
-    image: eclipseglsp/ci:alpine-v4.0
+    image: eclipseglsp/ci:alpine-v5.0
     resources:
       limits:
         memory: "2Gi"

diff --git a/client/examples/workflow-webapp/tsconfig.json b/client/examples/workflow-webapp/tsconfig.json
@@ -2,8 +2,7 @@
   "extends": "@eclipse-glsp/ts-config/tsconfig.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "outDir": "lib"
   },
   "include": ["src"]
 }
diff --git a/client/package.json b/client/package.json
@@ -23,7 +23,7 @@
     "watch": "lerna run --parallel watch"
   },
   "devDependencies": {
-    "@eclipse-glsp/dev": "next",
+    "@eclipse-glsp/dev": "^1.1.0-next.cbae4df.145",
     "@types/node": "16.x",
     "copyfiles": "^2.4.1",
     "inversify": "6.0.1",

diff --git a/client/packages/ide/tsconfig.json b/client/packages/ide/tsconfig.json
@@ -1,9 +1,8 @@
 {
-  "extends": "@eclipse-glsp/ts-config/tsconfig.json",
+  "extends": "@eclipse-glsp/ts-config",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib",
-    "baseUrl": "."
+    "outDir": "lib"
   },
   "include": ["src"]
 }
diff --git a/client/yarn.lock b/client/yarn.lock
diff --git a/server/example/org.eclipse.glsp.ide.workflow.editor/.classpath b/server/example/org.eclipse.glsp.ide.workflow.editor/.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/"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/server/example/org.eclipse.glsp.ide.workflow.editor/META-INF/MANIFEST.MF b/server/example/org.eclipse.glsp.ide.workflow.editor/META-INF/MANIFEST.MF
@@ -32,4 +32,4 @@ Import-Package: javax.servlet;version="[4.0.0,5.0.0)",
 Eclipse-BundleShape: dir
 Automatic-Module-Name: com.eclipsesource.glsp.example.workflow
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/server/example/org.eclipse.glsp.ide.workflow.editor/WorkflowEditor.launch b/server/example/org.eclipse.glsp.ide.workflow.editor/WorkflowEditor.launch
@@ -20,7 +20,7 @@
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" 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.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <booleanAttribute key="pde.generated.config" value="false"/>

diff --git a/server/plugins/org.eclipse.glsp.ide.editor/.classpath b/server/plugins/org.eclipse.glsp.ide.editor/.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/"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Eclipse GLSP
 Automatic-Module-Name: com.eclipsesource.glsp.editor
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.ui.ide;bundle-version="3.18.0",
  org.eclipse.swt;bundle-version="3.116.0",
  org.eclipse.ui.workbench;bundle-version="3.122.100",

diff --git a/server/pom.xml b/server/pom.xml
@@ -38,8 +38,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.source>11</java.source>
-		<java.target>11</java.target>
+		<java.source>17</java.source>
+		<java.target>17</java.target>
 		<project.build.java.target>1.8</project.build.java.target>
 		<tycho-version>2.7.5</tycho-version>
 		<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>

diff --git a/server/releng/org.eclipse.glsp.ide.releng.target/r2022-12.tpd b/server/releng/org.eclipse.glsp.ide.releng.target/r2022-12.tpd
@@ -12,7 +12,7 @@ location "mvn:org.eclipse.jetty:jetty-p2:10.0.13:zip:p2site" {
 	org.eclipse.jetty.websocket.javax.server
 }
 
-location "https://download.eclipse.org/glsp/server/p2/nightly/1.1/1.1.0.202309200810/" {
+location "https://download.eclipse.org/glsp/server/p2/nightly/1.1/1.1.0.202310110716/" {
 	org.eclipse.glsp.feature.feature.group lazy
 	org.eclipse.glsp.feature.source.feature.group lazy
 	org.eclipse.glsp.server.websocket lazy

diff --git a/server/releng/org.eclipse.glsp.ide.repository/pom.xml b/server/releng/org.eclipse.glsp.ide.repository/pom.xml
@@ -18,7 +18,7 @@
 				<artifactId>tycho-p2-publisher-plugin</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<profiles>JavaSE-11</profiles>
+					<profiles>JavaSE-17</profiles>
 				</configuration>
 			</plugin>
 			<!-- Skip cleaning of this module otherwise the release build is not working