From 0948cbc71e5d9ee89dd51e563b7e0f37ac06f459 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Fri, 29 Sep 2023 22:07:02 +0200 Subject: [PATCH 1/2] Update to Java 17 --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.glsp.graph/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../org.eclipse.glsp.graph/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.glsp.layout/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.glsp.server.emf/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.glsp.server/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- pom.xml | 7 +++---- releng/org.eclipse.glsp.repository/pom.xml | 4 ++-- tests/.project | 17 +++++++++++++++++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ tests/org.eclipse.glsp.graph.test/.classpath | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- tests/org.eclipse.glsp.server.test/.classpath | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 28 files changed, 66 insertions(+), 48 deletions(-) create mode 100644 tests/.project create mode 100644 tests/.settings/org.eclipse.core.resources.prefs diff --git a/examples/org.eclipse.glsp.example.workflow/.classpath b/examples/org.eclipse.glsp.example.workflow/.classpath index c14529a1..94eafea0 100644 --- a/examples/org.eclipse.glsp.example.workflow/.classpath +++ b/examples/org.eclipse.glsp.example.workflow/.classpath @@ -1,6 +1,6 @@ - + diff --git a/examples/org.eclipse.glsp.example.workflow/.settings/org.eclipse.jdt.core.prefs b/examples/org.eclipse.glsp.example.workflow/.settings/org.eclipse.jdt.core.prefs index 96c6af32..4d2068f6 100644 --- a/examples/org.eclipse.glsp.example.workflow/.settings/org.eclipse.jdt.core.prefs +++ b/examples/org.eclipse.glsp.example.workflow/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF index c1702d60..40119187 100644 --- a/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.glsp.example.workflow/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Export-Package: org.eclipse.glsp.example.workflow, org.eclipse.glsp.example.workflow.wfgraph.impl, org.eclipse.glsp.example.workflow.wfgraph.util Automatic-Module-Name: org.eclipse.glsp.example.workflow -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.glsp.layout;bundle-version="[1.0.0,2.0.0)", org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.glsp.server.websocket;bundle-version="[1.0.0,2.0.0)", diff --git a/plugins/org.eclipse.glsp.graph/.classpath b/plugins/org.eclipse.glsp.graph/.classpath index f5735d38..cb66d458 100644 --- a/plugins/org.eclipse.glsp.graph/.classpath +++ b/plugins/org.eclipse.glsp.graph/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs index 96c6af32..4d2068f6 100644 --- a/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.graph/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF index 867306d1..4bbf0366 100644 --- a/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.graph/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.glsp.graph;singleton:=true Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: org.eclipse.glsp.graph -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.common;bundle-version="2.23.0", com.google.gson;bundle-version="2.8.7", org.eclipse.emf.ecore;bundle-version="2.25.0";visibility:=reexport, diff --git a/plugins/org.eclipse.glsp.layout/.classpath b/plugins/org.eclipse.glsp.layout/.classpath index bc57d238..5508535a 100644 --- a/plugins/org.eclipse.glsp.layout/.classpath +++ b/plugins/org.eclipse.glsp.layout/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs index ded3a412..fb462ea4 100644 --- a/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.layout/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF index 6d089458..2a5fafb9 100644 --- a/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.layout/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.glsp.layout Bundle-Version: 1.1.0.qualifier Bundle-Vendor: EclispeSource Automatic-Module-Name: org.eclipse.glsp.layout -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.elk.core;bundle-version="0.8.1", org.eclipse.elk.graph;bundle-version="0.8.1", diff --git a/plugins/org.eclipse.glsp.server.emf/.classpath b/plugins/org.eclipse.glsp.server.emf/.classpath index c14529a1..94eafea0 100644 --- a/plugins/org.eclipse.glsp.server.emf/.classpath +++ b/plugins/org.eclipse.glsp.server.emf/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.glsp.server.emf/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.server.emf/.settings/org.eclipse.jdt.core.prefs index 96c6af32..4d2068f6 100644 --- a/plugins/org.eclipse.glsp.server.emf/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.server.emf/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF index 8fd4ee47..7c791e59 100644 --- a/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.emf/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ClassPath: . Bundle-Vendor: Eclipse GLSP Bundle-Localization: plugin Automatic-Module-Name: org.eclipse.glsp.example.emf -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.glsp.graph;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.ecore;bundle-version="2.25.0", diff --git a/plugins/org.eclipse.glsp.server.websocket/.classpath b/plugins/org.eclipse.glsp.server.websocket/.classpath index 96d26800..5933dd2d 100644 --- a/plugins/org.eclipse.glsp.server.websocket/.classpath +++ b/plugins/org.eclipse.glsp.server.websocket/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs index 6b97ef2c..1a9efa3f 100644 --- a/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.server.websocket/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF index bcdf3a24..b3841fd8 100644 --- a/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server.websocket/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.glsp.server.websocket Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: com.eclipsesource.glps.server.websocket -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: com.google.gson;bundle-version="2.8.7", org.eclipse.glsp.server;bundle-version="[1.0.0,2.0.0)", org.eclipse.lsp4j;bundle-version="0.11.0", diff --git a/plugins/org.eclipse.glsp.server/.classpath b/plugins/org.eclipse.glsp.server/.classpath index 96d26800..5933dd2d 100644 --- a/plugins/org.eclipse.glsp.server/.classpath +++ b/plugins/org.eclipse.glsp.server/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs index ded3a412..fb462ea4 100644 --- a/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.glsp.server/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF index 38b99ffb..8c878a94 100644 --- a/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.glsp.server/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.glsp.server Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse GLSP Automatic-Module-Name: org.eclipse.glsp.server -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore.change;bundle-version="2.14.0", com.google.gson;bundle-version="2.8.7", org.eclipse.lsp4j;bundle-version="0.11.0", diff --git a/pom.xml b/pom.xml index 5cd7fcee..e7d23c17 100644 --- a/pom.xml +++ b/pom.xml @@ -39,9 +39,9 @@ UTF-8 - 11 - 11 - 11 + 17 + 17 + 17 3.3.0 @@ -383,7 +383,6 @@ ossrh https://oss.sonatype.org/ - true diff --git a/releng/org.eclipse.glsp.repository/pom.xml b/releng/org.eclipse.glsp.repository/pom.xml index 688c892d..0b89028f 100644 --- a/releng/org.eclipse.glsp.repository/pom.xml +++ b/releng/org.eclipse.glsp.repository/pom.xml @@ -18,7 +18,7 @@ tycho-p2-publisher-plugin ${tycho.version} - JavaSE-11 + JavaSE-17 -application org.eclipse.ant.core.antRunner -buildfile packaging-p2composite.ant p2.composite.add -Dsite.label=${p2.site.label} -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier} -Dsoftware.download.area=${rsync.local.dir} diff --git a/tests/.project b/tests/.project new file mode 100644 index 00000000..57766597 --- /dev/null +++ b/tests/.project @@ -0,0 +1,17 @@ + + + org.eclipse.glsp.tests + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/tests/.settings/org.eclipse.core.resources.prefs b/tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..99f26c02 --- /dev/null +++ b/tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/tests/org.eclipse.glsp.graph.test/.classpath b/tests/org.eclipse.glsp.graph.test/.classpath index dbfe1494..e44b12f1 100644 --- a/tests/org.eclipse.glsp.graph.test/.classpath +++ b/tests/org.eclipse.glsp.graph.test/.classpath @@ -1,12 +1,12 @@ - + - + diff --git a/tests/org.eclipse.glsp.graph.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.glsp.graph.test/.settings/org.eclipse.jdt.core.prefs index 6b15cf89..11a48678 100644 --- a/tests/org.eclipse.glsp.graph.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.glsp.graph.test/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/tests/org.eclipse.glsp.graph.test/META-INF/MANIFEST.MF b/tests/org.eclipse.glsp.graph.test/META-INF/MANIFEST.MF index a659836a..ab23ee9e 100644 --- a/tests/org.eclipse.glsp.graph.test/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.glsp.graph.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.glsp.graph.test Bundle-Version: 0.10.0.qualifier Fragment-Host: org.eclipse.glsp.graph;bundle-version="0.10.0.qualifier" Automatic-Module-Name: org.eclipse.glsp.graph.test -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse GLSP Export-Package: org.eclipse.glsp.graph, org.eclipse.glsp.graph.impl diff --git a/tests/org.eclipse.glsp.server.test/.classpath b/tests/org.eclipse.glsp.server.test/.classpath index dbfe1494..e44b12f1 100644 --- a/tests/org.eclipse.glsp.server.test/.classpath +++ b/tests/org.eclipse.glsp.server.test/.classpath @@ -1,12 +1,12 @@ - + - + diff --git a/tests/org.eclipse.glsp.server.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.glsp.server.test/.settings/org.eclipse.jdt.core.prefs index 6b15cf89..11a48678 100644 --- a/tests/org.eclipse.glsp.server.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.glsp.server.test/.settings/org.eclipse.jdt.core.prefs @@ -30,9 +30,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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 @@ -147,7 +147,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=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO diff --git a/tests/org.eclipse.glsp.server.test/META-INF/MANIFEST.MF b/tests/org.eclipse.glsp.server.test/META-INF/MANIFEST.MF index 77182c6c..f981ef09 100644 --- a/tests/org.eclipse.glsp.server.test/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.glsp.server.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.glsp.server.test Bundle-Version: 0.8.0.qualifier Fragment-Host: org.eclipse.glsp.server;bundle-version="0.8.0" Automatic-Module-Name: org.eclipse.glsp.graph.test -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse GLSP Export-Package: org.eclipse.glsp.server.features.sourcemodelwatcher From 2daa631efc3c585edffa0f59ff8737cae9152688 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Mon, 9 Oct 2023 12:16:20 +0200 Subject: [PATCH 2/2] Update codeql workflow --- .github/workflows/codeql-analysis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d28d96d0..b5440c6b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,6 +40,10 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v2 + + - uses: actions/setup-java@v1 + with: + java-version: 17 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL @@ -54,6 +58,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Build with Maven + run: mvn -B -Pm2 clean verify --file pom.xml # ℹ️ Command-line programs to run using the OS shell.