build: upgrade target to use Java 21 to be compatible with Eclipse 4.35 (#1224)

Author: rubenporras

.github/workflows/build.yml

@@ -50,7 +50,7 @@ defaults:
 
 
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
 
 
 jobs:

org.eclipse.lsp4e.tests.mock/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mock Language Server to test LSP4E
 Bundle-SymbolicName: org.eclipse.lsp4e.tests.mock
-Bundle-Version: 0.16.14.qualifier
+Bundle-Version: 0.16.15.qualifier
 Bundle-Vendor: Eclipse LSP4E
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.lsp4j,

org.eclipse.lsp4e.tests.mock/src/org/eclipse/lsp4e/tests/mock/MockLanguageServer.java

@@ -129,10 +129,11 @@ public void waitBeforeTearDown() {
 			try {
 				future.join();
 			} catch (CancellationException | CompletionException e) {
+				Throwable cause = e.getCause();
 				System.err.println("Error waiting for in flight requests prior to teardown: " //
 						+ e.getClass().getSimpleName() + " with message "
 						+ (e.getMessage() == null ? "<null>" : '"' + e.getMessage()) //
-						+ (e.getCause() instanceof Throwable cause //
+						+ (cause != null //
 								? " caused by " + cause.getClass().getSimpleName() + " with message "
 										+ (cause.getMessage() == null ? "<null>" : '"' + cause.getMessage()) //
 								: ""));

org.eclipse.lsp4e/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Language Server Protocol client for Eclipse IDE (Incubation)
 Bundle-SymbolicName: org.eclipse.lsp4e;singleton:=true
-Bundle-Version: 0.18.18.qualifier
+Bundle-Version: 0.18.19.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.equinox.common;bundle-version="3.8.0",

org.eclipse.lsp4e/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<artifactId>org.eclipse.lsp4e</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<version>0.18.18-SNAPSHOT</version>
+	<version>0.18.19-SNAPSHOT</version>
 
 	<build>
 		<plugins>

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/typeHierarchy/TypeHierarchyDialog.java

@@ -9,13 +9,15 @@
 package org.eclipse.lsp4e.operations.typeHierarchy;
 
 
+import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.dialogs.PopupDialog;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4e.LanguageServersRegistry.LanguageServerDefinition;
+import org.eclipse.lsp4e.internal.NullSafetyHelper;
 import org.eclipse.lsp4e.ui.LSPImages;
 import org.eclipse.lsp4e.ui.Messages;
 import org.eclipse.lsp4j.TypeHierarchyItem;
@@ -56,8 +58,8 @@ public TypeHierarchyDialog(Shell parentShell, ITextSelection textSelection, IDoc
 	protected Control createDialogArea(Composite parent) {
 		final var filteredTree = new FilteredTree(parent, SWT.BORDER, new PatternFilter(), true, false) {
 			@Override
-			protected Composite createFilterControls(Composite parent) {
-				final var composite = new Composite(parent, SWT.NONE);
+			protected Composite createFilterControls(@Nullable Composite parent) {
+				final var composite = new Composite(NullSafetyHelper.castNonNull(parent), SWT.NONE);
 				final var layout = new GridLayout(2, false);
 				layout.horizontalSpacing=0;
 				layout.marginWidth=0;

org.eclipse.lsp4e/src/org/eclipse/lsp4e/operations/typeHierarchy/TypeHierarchyView.java

@@ -49,6 +49,7 @@
 import org.eclipse.lsp4e.LanguageServerWrapper;
 import org.eclipse.lsp4e.LanguageServers;
 import org.eclipse.lsp4e.internal.FileBufferListenerAdapter;
+import org.eclipse.lsp4e.internal.NullSafetyHelper;
 import org.eclipse.lsp4e.outline.SymbolsLabelProvider;
 import org.eclipse.lsp4e.outline.SymbolsModel;
 import org.eclipse.lsp4e.outline.SymbolsModel.DocumentSymbolWithURI;
@@ -330,8 +331,8 @@ private int getBestOrientation() {
 	private FilteredTree getFilteredTree(Composite parent) {
 		return new FilteredTree(parent, SWT.BORDER, new PatternFilter(), true, false) {
 			@Override
-			protected Composite createFilterControls(Composite parent) {
-				final var composite = new Composite(parent, SWT.NONE);
+			protected Composite createFilterControls(@Nullable Composite parent) {
+				final var composite = new Composite(NullSafetyHelper.castNonNull(parent), SWT.NONE);
 				final var layout = new GridLayout(2, false);
 				layout.horizontalSpacing=0;
 				layout.marginWidth=0;

target-platforms/target-platform-latest/target-platform-latest.target

@@ -38,5 +38,5 @@
       </dependencies>
     </location>
     </locations>
-  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 </target>