diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/docs/org.eclipse.n4js.design/.classpath b/docs/org.eclipse.n4js.design/.classpath index e3f3434365..9798bb1288 100644 --- a/docs/org.eclipse.n4js.design/.classpath +++ b/docs/org.eclipse.n4js.design/.classpath @@ -1,7 +1,7 @@ - + diff --git a/docs/org.eclipse.n4js.design/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.n4js.design/.settings/org.eclipse.jdt.core.prefs index 6558ab78fc..74b3a54360 100644 --- a/docs/org.eclipse.n4js.design/.settings/org.eclipse.jdt.core.prefs +++ b/docs/org.eclipse.n4js.design/.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.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 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.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/docs/org.eclipse.n4js.design/META-INF/MANIFEST.MF b/docs/org.eclipse.n4js.design/META-INF/MANIFEST.MF index 4093e55ab0..4b5d57c9dc 100644 --- a/docs/org.eclipse.n4js.design/META-INF/MANIFEST.MF +++ b/docs/org.eclipse.n4js.design/META-INF/MANIFEST.MF @@ -8,5 +8,4 @@ Require-Bundle: org.eclipse.help, org.eclipse.swt, org.eclipse.jface, org.eclipse.ui -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.design diff --git a/docs/org.eclipse.n4js.spec/.classpath b/docs/org.eclipse.n4js.spec/.classpath index e3f3434365..9798bb1288 100644 --- a/docs/org.eclipse.n4js.spec/.classpath +++ b/docs/org.eclipse.n4js.spec/.classpath @@ -1,7 +1,7 @@ - + diff --git a/docs/org.eclipse.n4js.spec/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.n4js.spec/.settings/org.eclipse.jdt.core.prefs index 6558ab78fc..74b3a54360 100644 --- a/docs/org.eclipse.n4js.spec/.settings/org.eclipse.jdt.core.prefs +++ b/docs/org.eclipse.n4js.spec/.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.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 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.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/docs/org.eclipse.n4js.spec/META-INF/MANIFEST.MF b/docs/org.eclipse.n4js.spec/META-INF/MANIFEST.MF index 55c7ccfa71..5264bbe53c 100644 --- a/docs/org.eclipse.n4js.spec/META-INF/MANIFEST.MF +++ b/docs/org.eclipse.n4js.spec/META-INF/MANIFEST.MF @@ -8,5 +8,4 @@ Require-Bundle: org.eclipse.help, org.eclipse.swt, org.eclipse.jface, org.eclipse.ui -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.spec diff --git a/plugins/org.eclipse.n4js.cli/.classpath b/plugins/org.eclipse.n4js.cli/.classpath index c5932f42c7..bc6087ae29 100644 --- a/plugins/org.eclipse.n4js.cli/.classpath +++ b/plugins/org.eclipse.n4js.cli/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.cli/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.cli/.settings/org.eclipse.jdt.core.prefs index 5cec2e8952..3f77640df9 100644 --- a/plugins/org.eclipse.n4js.cli/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.cli/.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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 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=warning 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=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.cli/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.cli/META-INF/MANIFEST.MF index 6c431ffe11..4b0a9eae64 100644 --- a/plugins/org.eclipse.n4js.cli/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.cli/META-INF/MANIFEST.MF @@ -29,4 +29,3 @@ Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.n4js.cli, org.eclipse.n4js.cli.compiler Automatic-Module-Name: org.eclipse.n4js.cli -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js.common.unicode/.classpath b/plugins/org.eclipse.n4js.common.unicode/.classpath index 3cfbdf7de5..159e1fc1e2 100644 --- a/plugins/org.eclipse.n4js.common.unicode/.classpath +++ b/plugins/org.eclipse.n4js.common.unicode/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.common.unicode/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.common.unicode/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.common.unicode/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.common.unicode/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.common.unicode/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.common.unicode/META-INF/MANIFEST.MF index e490926884..f8f148c7a1 100644 --- a/plugins/org.eclipse.n4js.common.unicode/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.common.unicode/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.n4js.releng.utils;resolution:=optional, org.eclipse.equinox.common;bundle-version="3.8.0";resolution:=optional, org.objectweb.asm;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.common.unicode, org.eclipse.n4js.common.unicode.serializer, org.eclipse.n4js.common.unicode.services diff --git a/plugins/org.eclipse.n4js.dts/.classpath b/plugins/org.eclipse.n4js.dts/.classpath index 97b9b8c2e6..6f192c835a 100644 --- a/plugins/org.eclipse.n4js.dts/.classpath +++ b/plugins/org.eclipse.n4js.dts/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.dts/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.dts/.settings/org.eclipse.jdt.core.prefs index f9b2981c41..fb70d1d5a1 100644 --- a/plugins/org.eclipse.n4js.dts/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.dts/.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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -149,7 +149,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/plugins/org.eclipse.n4js.dts/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.dts/META-INF/MANIFEST.MF index 4b932159f8..aefc856ec8 100644 --- a/plugins/org.eclipse.n4js.dts/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.dts/META-INF/MANIFEST.MF @@ -23,4 +23,3 @@ Export-Package: org.antlr.v4.runtime, org.eclipse.n4js.dts, org.eclipse.n4js.dts.utils Automatic-Module-Name: org.eclipse.n4js.dts -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js.flowgraphs/.classpath b/plugins/org.eclipse.n4js.flowgraphs/.classpath index 3628e33687..2869279ea3 100644 --- a/plugins/org.eclipse.n4js.flowgraphs/.classpath +++ b/plugins/org.eclipse.n4js.flowgraphs/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.flowgraphs/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.flowgraphs/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.flowgraphs/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.flowgraphs/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.flowgraphs/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.flowgraphs/META-INF/MANIFEST.MF index b8f15c5354..c014a61d7d 100644 --- a/plugins/org.eclipse.n4js.flowgraphs/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.flowgraphs/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.flowgraphs;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js.ts.model, org.eclipse.n4js.releng.utils;resolution:=optional, org.eclipse.n4js.utils, diff --git a/plugins/org.eclipse.n4js.ide/.classpath b/plugins/org.eclipse.n4js.ide/.classpath index fc609eff89..c634bf3b1b 100644 --- a/plugins/org.eclipse.n4js.ide/.classpath +++ b/plugins/org.eclipse.n4js.ide/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/plugins/org.eclipse.n4js.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.ide/.settings/org.eclipse.jdt.core.prefs index f22022d1bb..af31e52a48 100644 --- a/plugins/org.eclipse.n4js.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.ide/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.ide/META-INF/MANIFEST.MF index a8ee10aa3d..09ebca8176 100644 --- a/plugins/org.eclipse.n4js.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.ide/META-INF/MANIFEST.MF @@ -44,4 +44,3 @@ Export-Package: org.eclipse.n4js.ide, org.eclipse.n4js.ide.server.hover, org.eclipse.n4js.ide.server.util Automatic-Module-Name: org.eclipse.n4js.ide -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/N4JSWorkspaceFrontend.java b/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/N4JSWorkspaceFrontend.java index f6333ace09..845fa0a538 100644 --- a/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/N4JSWorkspaceFrontend.java +++ b/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/N4JSWorkspaceFrontend.java @@ -36,7 +36,7 @@ /** * N4JS-specific customizations of {@link WorkspaceFrontend}. */ -@SuppressWarnings({ "restriction", "deprecation" }) +@SuppressWarnings({ "restriction" }) public class N4JSWorkspaceFrontend extends WorkspaceFrontend { @Inject @@ -77,9 +77,9 @@ protected Either, List, List> symbols = workspaceSymbolService + List symbols = workspaceSymbolService .getSymbols(params.getQuery(), resourceAccess, liveScopeIndex, cancelIndicator); - return symbols; + return Either.forRight(symbols); } catch (Throwable th) { // It seems that if this request fails (even if due to a cancellation), then some LSP clients (e.g. VS Code) // will never try a 'workspace/symbols' request again, effectively turning off operation "open workspace diff --git a/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSDocumentSymbolService.java b/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSDocumentSymbolService.java index 1c298ce22e..306dccb81c 100644 --- a/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSDocumentSymbolService.java +++ b/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSDocumentSymbolService.java @@ -23,6 +23,7 @@ import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.SymbolInformation; import org.eclipse.lsp4j.SymbolKind; +import org.eclipse.lsp4j.WorkspaceSymbol; import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.eclipse.n4js.ide.server.util.SymbolKindUtil; import org.eclipse.n4js.n4JS.BindingElement; @@ -65,7 +66,7 @@ * obtaining symbol information. See {@link #getSymbolLocation(IEObjectDescription)}. */ @Singleton -@SuppressWarnings({ "restriction", "deprecation" }) +@SuppressWarnings({ "restriction" }) public class N4JSDocumentSymbolService extends XDocumentSymbolService { @Inject @@ -156,22 +157,22 @@ protected boolean filter(IEObjectDescription description, String query) { @Override protected void createSymbol(IEObjectDescription description, IResourceAccess resourceAccess, - Procedure1 acceptor) { + Procedure1 acceptor) { - SymbolInformation symbol = createSymbol(description); + WorkspaceSymbol symbol = createSymbol(description); if (symbol != null) { acceptor.apply(symbol); } } @Override - protected SymbolInformation createSymbol(IEObjectDescription description) { - SymbolInformation symbol = super.createSymbol(description); + protected WorkspaceSymbol createSymbol(IEObjectDescription description) { + WorkspaceSymbol symbol = super.createSymbol(description); if (symbol == null) { return null; } symbol.setContainerName(getContainerName(description)); - symbol.setLocation(getSymbolLocation(description)); + symbol.setLocation(Either.forLeft(getSymbolLocation(description))); return symbol; } @@ -235,19 +236,17 @@ protected SymbolKind getSymbolKind(EClass type) { } @Override - public List> getSymbols(XtextResource resource, + public List getSymbols(XtextResource resource, CancelIndicator cancelIndicator) { ArrayList infos = new ArrayList<>(); - List rootSymbols = Lists - .transform(hierarchicalDocumentSymbolService.getSymbols(resource, cancelIndicator), Either::getRight); - + List rootSymbols = hierarchicalDocumentSymbolService.getSymbols(resource, cancelIndicator); for (DocumentSymbol rootSymbol : rootSymbols) { Iterable symbols = Traverser.forTree(DocumentSymbol::getChildren) .depthFirstPreOrder(rootSymbol); infos.addAll(Lists.newArrayList(symbols)); } - return Lists.transform(infos, Either::forRight); + return infos; } } diff --git a/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSWorkspaceSymbolService.java b/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSWorkspaceSymbolService.java index 87ec7ee116..e7a0747b4f 100644 --- a/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSWorkspaceSymbolService.java +++ b/plugins/org.eclipse.n4js.ide/src/org/eclipse/n4js/ide/server/symbol/N4JSWorkspaceSymbolService.java @@ -14,9 +14,7 @@ import java.util.List; import org.eclipse.emf.common.util.URI; -import org.eclipse.lsp4j.SymbolInformation; import org.eclipse.lsp4j.WorkspaceSymbol; -import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.eclipse.n4js.utils.ResourceType; import org.eclipse.xtext.findReferences.IReferenceFinder.IResourceAccess; import org.eclipse.xtext.ide.server.symbol.DocumentSymbolService; @@ -35,7 +33,7 @@ * language-specific {@link DocumentSymbolService} returned by the {@link IResourceServiceProvider}. */ @Singleton -@SuppressWarnings({ "restriction", "deprecation" }) +@SuppressWarnings({ "restriction" }) public class N4JSWorkspaceSymbolService extends WorkspaceSymbolService { @Inject // note: we deliberately inject >>N4JS<, List> getSymbols(String query, + public List getSymbols(String query, IResourceAccess resourceAccess, IResourceDescriptions indexData, CancelIndicator cancelIndicator) { List result = new LinkedList<>(); @@ -63,6 +61,6 @@ public Either, List // of workspace symbols) } } - return Either.forRight(result); + return result; } } diff --git a/plugins/org.eclipse.n4js.jsdoc/.classpath b/plugins/org.eclipse.n4js.jsdoc/.classpath index af27bdbd59..59005d8b19 100644 --- a/plugins/org.eclipse.n4js.jsdoc/.classpath +++ b/plugins/org.eclipse.n4js.jsdoc/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.jsdoc/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.jsdoc/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.jsdoc/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.jsdoc/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.jsdoc/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.jsdoc/META-INF/MANIFEST.MF index 2d8bd65180..1a608d2ef4 100644 --- a/plugins/org.eclipse.n4js.jsdoc/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.jsdoc/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.jsdoc;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js.ts.model, org.eclipse.n4js.utils, org.eclipse.n4js, diff --git a/plugins/org.eclipse.n4js.jsdoc2spec/.classpath b/plugins/org.eclipse.n4js.jsdoc2spec/.classpath index 3628e33687..2869279ea3 100644 --- a/plugins/org.eclipse.n4js.jsdoc2spec/.classpath +++ b/plugins/org.eclipse.n4js.jsdoc2spec/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.jsdoc2spec/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.jsdoc2spec/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.jsdoc2spec/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.jsdoc2spec/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.jsdoc2spec/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.jsdoc2spec/META-INF/MANIFEST.MF index 57bca9913e..76020a357a 100644 --- a/plugins/org.eclipse.n4js.jsdoc2spec/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.jsdoc2spec/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.jsdoc2spec;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.ts.model, org.eclipse.n4js.jsdoc, diff --git a/plugins/org.eclipse.n4js.jsdoc2spec/src/org/eclipse/n4js/jsdoc2spec/adoc/Html2ADocConverter.java b/plugins/org.eclipse.n4js.jsdoc2spec/src/org/eclipse/n4js/jsdoc2spec/adoc/Html2ADocConverter.java index d8d9328982..58a06e6631 100644 --- a/plugins/org.eclipse.n4js.jsdoc2spec/src/org/eclipse/n4js/jsdoc2spec/adoc/Html2ADocConverter.java +++ b/plugins/org.eclipse.n4js.jsdoc2spec/src/org/eclipse/n4js/jsdoc2spec/adoc/Html2ADocConverter.java @@ -136,7 +136,7 @@ private String pass(String s) { */ public CharSequence transformHTML(CharSequence html) { StringBuilder strb = new StringBuilder(); - transformHTML(html, 0, strb, new LinkedList(), ""); + transformHTML(html, 0, strb, new LinkedList<>(), ""); return strb; } diff --git a/plugins/org.eclipse.n4js.json.ide/.classpath b/plugins/org.eclipse.n4js.json.ide/.classpath index fc609eff89..c634bf3b1b 100644 --- a/plugins/org.eclipse.n4js.json.ide/.classpath +++ b/plugins/org.eclipse.n4js.json.ide/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/plugins/org.eclipse.n4js.json.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.json.ide/.settings/org.eclipse.jdt.core.prefs index 49840a3863..e6bd9a1da5 100644 --- a/plugins/org.eclipse.n4js.json.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.json.ide/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.json.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.json.ide/META-INF/MANIFEST.MF index faff59e562..10b8e5e551 100644 --- a/plugins/org.eclipse.n4js.json.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.json.ide/META-INF/MANIFEST.MF @@ -22,4 +22,3 @@ Export-Package: org.eclipse.n4js.json.ide, org.eclipse.n4js.json.ide.contentassist.antlr.internal, org.eclipse.n4js.json.ide.symbol Automatic-Module-Name: org.eclipse.n4js.json.ide -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js.json.ide/src/org/eclipse/n4js/json/ide/symbol/JSONHierarchicalSymbolService.java b/plugins/org.eclipse.n4js.json.ide/src/org/eclipse/n4js/json/ide/symbol/JSONHierarchicalSymbolService.java index afe597fca8..885d7a8726 100644 --- a/plugins/org.eclipse.n4js.json.ide/src/org/eclipse/n4js/json/ide/symbol/JSONHierarchicalSymbolService.java +++ b/plugins/org.eclipse.n4js.json.ide/src/org/eclipse/n4js/json/ide/symbol/JSONHierarchicalSymbolService.java @@ -16,8 +16,6 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.lsp4j.DocumentSymbol; -import org.eclipse.lsp4j.SymbolInformation; -import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.eclipse.n4js.json.JSON.JSONDocument; import org.eclipse.n4js.json.JSON.JSONValue; import org.eclipse.n4js.json.JSON.NameValuePair; @@ -32,7 +30,6 @@ /** * Creates the JSON outline tree for LSP based editors. */ -@SuppressWarnings("deprecation") public class JSONHierarchicalSymbolService extends HierarchicalDocumentSymbolService { @Inject @@ -42,15 +39,15 @@ public class JSONHierarchicalSymbolService extends HierarchicalDocumentSymbolSer private OperationCanceledManager operationCanceledManager; @Override - public List> getSymbols(XtextResource resource, + public List getSymbols(XtextResource resource, CancelIndicator cancelIndicator) { - List> result = new ArrayList<>(); + List result = new ArrayList<>(); for (EObject content : resource.getContents()) { if (content instanceof JSONDocument) { JSONDocument document = (JSONDocument) content; JSONValue rootValue = document.getContent(); - getSymbols(rootValue, symbol -> result.add(Either.forRight(symbol)), cancelIndicator); + getSymbols(rootValue, symbol -> result.add(symbol), cancelIndicator); } } return result; diff --git a/plugins/org.eclipse.n4js.json.model/.classpath b/plugins/org.eclipse.n4js.json.model/.classpath index 3e60fca16f..03c937bb41 100644 --- a/plugins/org.eclipse.n4js.json.model/.classpath +++ b/plugins/org.eclipse.n4js.json.model/.classpath @@ -5,9 +5,8 @@ - - + diff --git a/plugins/org.eclipse.n4js.json.model/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.json.model/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.json.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.json.model/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.json.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.json.model/META-INF/MANIFEST.MF index 568c6a3c76..1e37583cd3 100644 --- a/plugins/org.eclipse.n4js.json.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.json.model/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.emf.ecore.xcore, org.objectweb.asm;resolution:=optional, org.eclipse.equinox.common;resolution:=optional Automatic-Module-Name: org.eclipse.n4js.json.model -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.json.JSON, org.eclipse.n4js.json.JSON.util, org.eclipse.n4js.json.model.utils diff --git a/plugins/org.eclipse.n4js.json/.classpath b/plugins/org.eclipse.n4js.json/.classpath index 7f20dda608..d2ef32f716 100644 --- a/plugins/org.eclipse.n4js.json/.classpath +++ b/plugins/org.eclipse.n4js.json/.classpath @@ -6,7 +6,7 @@ - + diff --git a/plugins/org.eclipse.n4js.json/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.json/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.json/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.json/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.json/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.json/META-INF/MANIFEST.MF index 48c7abe83e..ab05523a0e 100644 --- a/plugins/org.eclipse.n4js.json/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.json/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.xtext.xbase, org.eclipse.n4js.releng.utils, org.eclipse.xtext.xtext.generator, org.eclipse.core.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.json Export-Package: org.eclipse.n4js.json, org.eclipse.n4js.json.extension, diff --git a/plugins/org.eclipse.n4js.model/.classpath b/plugins/org.eclipse.n4js.model/.classpath index af27bdbd59..59005d8b19 100644 --- a/plugins/org.eclipse.n4js.model/.classpath +++ b/plugins/org.eclipse.n4js.model/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.model/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.model/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.model/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.model/META-INF/MANIFEST.MF index 2eed009800..fff1a738db 100644 --- a/plugins/org.eclipse.n4js.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.model/META-INF/MANIFEST.MF @@ -15,6 +15,5 @@ Export-Package: org.eclipse.n4js.n4JS, org.eclipse.n4js, org.eclipse.n4js.n4JS.impl, org.eclipse.n4js.n4JS.util -Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %providerName Automatic-Module-Name: org.eclipse.n4js.model diff --git a/plugins/org.eclipse.n4js.regex.ide/.classpath b/plugins/org.eclipse.n4js.regex.ide/.classpath index fc609eff89..c634bf3b1b 100644 --- a/plugins/org.eclipse.n4js.regex.ide/.classpath +++ b/plugins/org.eclipse.n4js.regex.ide/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/plugins/org.eclipse.n4js.regex.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.regex.ide/.settings/org.eclipse.jdt.core.prefs index 49840a3863..e6bd9a1da5 100644 --- a/plugins/org.eclipse.n4js.regex.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.regex.ide/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.regex.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.regex.ide/META-INF/MANIFEST.MF index f402203a9f..6632408540 100644 --- a/plugins/org.eclipse.n4js.regex.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.regex.ide/META-INF/MANIFEST.MF @@ -17,4 +17,3 @@ Export-Package: org.eclipse.n4js.regex.ide, org.eclipse.n4js.regex.ide.contentassist.antlr.internal, org.eclipse.n4js.regex.ide.contentassist.antlr.lexer Automatic-Module-Name: org.eclipse.n4js.regex.ide -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js.regex/.classpath b/plugins/org.eclipse.n4js.regex/.classpath index 5153825dfe..9dbdb39316 100644 --- a/plugins/org.eclipse.n4js.regex/.classpath +++ b/plugins/org.eclipse.n4js.regex/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.regex/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.regex/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.regex/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.regex/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.regex/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.regex/META-INF/MANIFEST.MF index 09f396f497..f6851a7e02 100644 --- a/plugins/org.eclipse.n4js.regex/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.regex/META-INF/MANIFEST.MF @@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtext.xbase.lib, org.eclipse.equinox.common;resolution:=optional, org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.regex, org.eclipse.n4js.regex.services, org.eclipse.n4js.regex.regularExpression, diff --git a/plugins/org.eclipse.n4js.semver.ide/.classpath b/plugins/org.eclipse.n4js.semver.ide/.classpath index fc609eff89..c634bf3b1b 100644 --- a/plugins/org.eclipse.n4js.semver.ide/.classpath +++ b/plugins/org.eclipse.n4js.semver.ide/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/plugins/org.eclipse.n4js.semver.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.semver.ide/.settings/org.eclipse.jdt.core.prefs index 49840a3863..e6bd9a1da5 100644 --- a/plugins/org.eclipse.n4js.semver.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.semver.ide/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -134,7 +134,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.semver.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.semver.ide/META-INF/MANIFEST.MF index 836986002d..774710ff85 100644 --- a/plugins/org.eclipse.n4js.semver.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.semver.ide/META-INF/MANIFEST.MF @@ -15,4 +15,3 @@ Require-Bundle: org.eclipse.n4js.semver, com.google.inject, com.google.gson Automatic-Module-Name: org.eclipse.n4js.semver.ide -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js.semver.model/.classpath b/plugins/org.eclipse.n4js.semver.model/.classpath index 3e60fca16f..03c937bb41 100644 --- a/plugins/org.eclipse.n4js.semver.model/.classpath +++ b/plugins/org.eclipse.n4js.semver.model/.classpath @@ -5,9 +5,8 @@ - - + diff --git a/plugins/org.eclipse.n4js.semver.model/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.semver.model/.settings/org.eclipse.jdt.core.prefs index f22022d1bb..af31e52a48 100644 --- a/plugins/org.eclipse.n4js.semver.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.semver.model/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.semver.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.semver.model/META-INF/MANIFEST.MF index fceb380eca..17ece4e892 100644 --- a/plugins/org.eclipse.n4js.semver.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.semver.model/META-INF/MANIFEST.MF @@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.emf.ecore.xcore, org.eclipse.equinox.common;resolution:=optional, org.eclipse.jdt.core Automatic-Module-Name: org.eclipse.n4js.semver.model -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.semver.Semver, org.eclipse.n4js.semver.model, org.eclipse.n4js.semver.Semver.util diff --git a/plugins/org.eclipse.n4js.semver/.classpath b/plugins/org.eclipse.n4js.semver/.classpath index 7f20dda608..d2ef32f716 100644 --- a/plugins/org.eclipse.n4js.semver/.classpath +++ b/plugins/org.eclipse.n4js.semver/.classpath @@ -6,7 +6,7 @@ - + diff --git a/plugins/org.eclipse.n4js.semver/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.semver/.settings/org.eclipse.jdt.core.prefs index f22022d1bb..af31e52a48 100644 --- a/plugins/org.eclipse.n4js.semver/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.semver/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.semver/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.semver/META-INF/MANIFEST.MF index 533113ffae..9e9b485c0d 100644 --- a/plugins/org.eclipse.n4js.semver/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.semver/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.testing, org.eclipse.xtext.xtext.generator, org.eclipse.core.resources -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.semver Export-Package: org.eclipse.n4js.semver.validation, org.eclipse.n4js.semver.parser.antlr, diff --git a/plugins/org.eclipse.n4js.smith/.classpath b/plugins/org.eclipse.n4js.smith/.classpath index 3628e33687..2869279ea3 100644 --- a/plugins/org.eclipse.n4js.smith/.classpath +++ b/plugins/org.eclipse.n4js.smith/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.smith/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.smith/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.smith/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.smith/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.smith/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.smith/META-INF/MANIFEST.MF index deb1c8436c..62fd5d24af 100644 --- a/plugins/org.eclipse.n4js.smith/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.smith/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.n4js.smith Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.smith Require-Bundle: com.google.inject, com.google.guava, diff --git a/plugins/org.eclipse.n4js.smith/src/org/eclipse/n4js/smith/SerializingDataCollector.java b/plugins/org.eclipse.n4js.smith/src/org/eclipse/n4js/smith/SerializingDataCollector.java index 46ffbe80be..e967c85ecb 100644 --- a/plugins/org.eclipse.n4js.smith/src/org/eclipse/n4js/smith/SerializingDataCollector.java +++ b/plugins/org.eclipse.n4js.smith/src/org/eclipse/n4js/smith/SerializingDataCollector.java @@ -13,8 +13,7 @@ import java.util.Collection; import java.util.List; import java.util.concurrent.locks.ReentrantLock; - -import com.google.common.base.Supplier; +import java.util.function.Supplier; /** * A collector decorator that will ensure that measurements are not created concurrently. diff --git a/plugins/org.eclipse.n4js.transpiler.dts/.classpath b/plugins/org.eclipse.n4js.transpiler.dts/.classpath index e3378d07f0..6ee44e2c8e 100644 --- a/plugins/org.eclipse.n4js.transpiler.dts/.classpath +++ b/plugins/org.eclipse.n4js.transpiler.dts/.classpath @@ -1,7 +1,7 @@ - + diff --git a/plugins/org.eclipse.n4js.transpiler.dts/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.transpiler.dts/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.transpiler.dts/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.transpiler.dts/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.transpiler.dts/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.transpiler.dts/META-INF/MANIFEST.MF index 813f642981..2cb07d1699 100644 --- a/plugins/org.eclipse.n4js.transpiler.dts/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.transpiler.dts/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.transpiler.dts;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.transpiler, org.eclipse.n4js.transpiler.es, diff --git a/plugins/org.eclipse.n4js.transpiler.es/.classpath b/plugins/org.eclipse.n4js.transpiler.es/.classpath index e3378d07f0..6ee44e2c8e 100644 --- a/plugins/org.eclipse.n4js.transpiler.es/.classpath +++ b/plugins/org.eclipse.n4js.transpiler.es/.classpath @@ -1,7 +1,7 @@ - + diff --git a/plugins/org.eclipse.n4js.transpiler.es/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.transpiler.es/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.transpiler.es/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.transpiler.es/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.transpiler.es/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.transpiler.es/META-INF/MANIFEST.MF index 7064803f47..d29a4cca1c 100644 --- a/plugins/org.eclipse.n4js.transpiler.es/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.transpiler.es/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.transpiler.es;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.transpiler, org.apache.log4j, diff --git a/plugins/org.eclipse.n4js.transpiler/.classpath b/plugins/org.eclipse.n4js.transpiler/.classpath index bc000d436d..83f5d8b183 100644 --- a/plugins/org.eclipse.n4js.transpiler/.classpath +++ b/plugins/org.eclipse.n4js.transpiler/.classpath @@ -6,7 +6,7 @@ - + diff --git a/plugins/org.eclipse.n4js.transpiler/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.transpiler/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.transpiler/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.transpiler/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.transpiler/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.transpiler/META-INF/MANIFEST.MF index 46e92d23b8..52e3f2b1d7 100644 --- a/plugins/org.eclipse.n4js.transpiler/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.transpiler/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.transpiler;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.utils, org.apache.log4j, diff --git a/plugins/org.eclipse.n4js.ts.model/.classpath b/plugins/org.eclipse.n4js.ts.model/.classpath index af27bdbd59..59005d8b19 100644 --- a/plugins/org.eclipse.n4js.ts.model/.classpath +++ b/plugins/org.eclipse.n4js.ts.model/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.ts.model/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.ts.model/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.ts.model/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.ts.model/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.ts.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.ts.model/META-INF/MANIFEST.MF index 4a60da0da8..8406d372e6 100644 --- a/plugins/org.eclipse.n4js.ts.model/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.ts.model/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.n4js.releng.utils;resolution:=optional, org.eclipse.n4js.smith, org.objectweb.asm, org.apache.commons.logging -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.ts.typeRefs, org.eclipse.n4js.ts.typeRefs.impl, org.eclipse.n4js.ts.typeRefs.util, diff --git a/plugins/org.eclipse.n4js.ts.model/src/org/eclipse/n4js/ts/types/util/TypeUtils.java b/plugins/org.eclipse.n4js.ts.model/src/org/eclipse/n4js/ts/types/util/TypeUtils.java index b16bcddee9..4688bafbd6 100644 --- a/plugins/org.eclipse.n4js.ts.model/src/org/eclipse/n4js/ts/types/util/TypeUtils.java +++ b/plugins/org.eclipse.n4js.ts.model/src/org/eclipse/n4js/ts/types/util/TypeUtils.java @@ -956,7 +956,7 @@ public static Iterable declaredSuperTypes(final * Check if superTypeCandidate is raw super type of Type. Structural typing is ignored here. */ public static boolean isRawSuperType(Type type, Type superTypeCandidate) { - return isRawSuperType(type, superTypeCandidate, new RecursionGuard()); + return isRawSuperType(type, superTypeCandidate, new RecursionGuard<>()); } private static boolean isRawSuperType(Type type, Type superTypeCandidate, RecursionGuard guard) { diff --git a/plugins/org.eclipse.n4js.utils.logging/.classpath b/plugins/org.eclipse.n4js.utils.logging/.classpath index 558b50a9d9..791f73318f 100644 --- a/plugins/org.eclipse.n4js.utils.logging/.classpath +++ b/plugins/org.eclipse.n4js.utils.logging/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.utils.logging/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.utils.logging/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/plugins/org.eclipse.n4js.utils.logging/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.utils.logging/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.utils.logging/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.utils.logging/META-INF/MANIFEST.MF index 888206dd04..18a663981c 100644 --- a/plugins/org.eclipse.n4js.utils.logging/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.utils.logging/META-INF/MANIFEST.MF @@ -5,5 +5,4 @@ Bundle-SymbolicName: org.eclipse.n4js.utils.logging Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName Fragment-Host: org.apache.log4j;bundle-version="1.2.15" -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.utils.logging diff --git a/plugins/org.eclipse.n4js.utils/.classpath b/plugins/org.eclipse.n4js.utils/.classpath index af27bdbd59..59005d8b19 100644 --- a/plugins/org.eclipse.n4js.utils/.classpath +++ b/plugins/org.eclipse.n4js.utils/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.utils/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.utils/.settings/org.eclipse.jdt.core.prefs index d0cd3cd094..4dcbc097d2 100644 --- a/plugins/org.eclipse.n4js.utils/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.utils/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.utils/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.utils/META-INF/MANIFEST.MF index ce9d5a4a97..0f8ba8e710 100644 --- a/plugins/org.eclipse.n4js.utils/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.utils/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.utils;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js.releng.utils;resolution:=optional, org.eclipse.emf.ecore.xcore, org.eclipse.emf.mwe2.launch;resolution:=optional, @@ -15,7 +14,6 @@ Require-Bundle: org.eclipse.n4js.releng.utils;resolution:=optional, org.eclipse.xtend, org.eclipse.xtend.lib, org.apache.log4j;visibility:=reexport, - org.slf4j.api, org.apache.commons.logging;resolution:=optional, org.eclipse.equinox.common;resolution:=optional, com.google.gson;visibility:=reexport, diff --git a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/UtilN4.java b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/UtilN4.java index e9713974c6..d47c6ebb35 100644 --- a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/UtilN4.java +++ b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/UtilN4.java @@ -380,7 +380,7 @@ public static String indentExceptFirstLine(String str, String indentStr) { } private static final Map reportedExceptions = Collections.synchronizedMap( - new WeakHashMap()); + new WeakHashMap<>()); /** * Same as {@link #reportError(Logger, String, Throwable)}, but will log the incident only if the given exception diff --git a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/process/ProcessExecutor.java b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/process/ProcessExecutor.java index 79e43f077c..e010176187 100644 --- a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/process/ProcessExecutor.java +++ b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/utils/process/ProcessExecutor.java @@ -15,14 +15,13 @@ import java.io.IOException; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; - import org.apache.log4j.Logger; import org.eclipse.n4js.utils.io.OutputRedirection; import org.eclipse.n4js.utils.io.OutputStreamPrinterThread; import org.eclipse.n4js.utils.io.OutputStreamPrinterThreadProvider; import org.eclipse.xtext.xbase.lib.StringExtensions; +import com.google.inject.Inject; import com.google.inject.Singleton; /** diff --git a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedContextTypePDAProvider.java b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedContextTypePDAProvider.java index 37219b4a32..8bb4fd2074 100644 --- a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedContextTypePDAProvider.java +++ b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedContextTypePDAProvider.java @@ -26,9 +26,9 @@ class SynchronizedContextTypePDAProvider extends ContextTypePDAProvider { public SynchronizedContextTypePDAProvider() { try { - new ReflectExtensions().set(this, "cache", - new ValueWrappingMap>>( - SynchronizedSerializationContextMap::from)); + ValueWrappingMap>> vwm = new ValueWrappingMap<>( + SynchronizedSerializationContextMap::from); + new ReflectExtensions().set(this, "cache", vwm); } catch (SecurityException | NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) { throw new RuntimeException(e); } diff --git a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedGrammarConstraintProvider.java b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedGrammarConstraintProvider.java index b6934764ae..9220723ff6 100644 --- a/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedGrammarConstraintProvider.java +++ b/plugins/org.eclipse.n4js.utils/src/org/eclipse/n4js/xtext/serializer/SynchronizedGrammarConstraintProvider.java @@ -23,9 +23,9 @@ class SynchronizedGrammarConstraintProvider extends GrammarConstraintProvider { public SynchronizedGrammarConstraintProvider() { try { - new ReflectExtensions().set(this, "cache", - new ValueWrappingMap>( - SynchronizedSerializationContextMap::from)); + ValueWrappingMap> vwm = new ValueWrappingMap<>( + SynchronizedSerializationContextMap::from); + new ReflectExtensions().set(this, "cache", vwm); } catch (SecurityException | NoSuchFieldException | IllegalArgumentException | IllegalAccessException e) { throw new RuntimeException(e); } diff --git a/plugins/org.eclipse.n4js.xtext.ide/.classpath b/plugins/org.eclipse.n4js.xtext.ide/.classpath index e3816396dd..f96aed716d 100644 --- a/plugins/org.eclipse.n4js.xtext.ide/.classpath +++ b/plugins/org.eclipse.n4js.xtext.ide/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.xtext.ide/.settings/org.eclipse.jdt.core.prefs index f22022d1bb..af31e52a48 100644 --- a/plugins/org.eclipse.n4js.xtext.ide/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.xtext.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.xtext.ide/META-INF/MANIFEST.MF index c092dec4ca..9474f639c6 100644 --- a/plugins/org.eclipse.n4js.xtext.ide/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.xtext.ide/META-INF/MANIFEST.MF @@ -27,4 +27,3 @@ Export-Package: org.eclipse.n4js.xtext.resource, org.eclipse.n4js.xtext.ide.server.symbol, org.eclipse.n4js.xtext.ide.server.util Automatic-Module-Name: org.eclipse.n4js.xtext -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/LanguageServerFrontend.java b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/LanguageServerFrontend.java index a6dbe7e423..7e33773541 100644 --- a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/LanguageServerFrontend.java +++ b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/LanguageServerFrontend.java @@ -95,7 +95,6 @@ /** * */ -@SuppressWarnings("deprecation") @Singleton public class LanguageServerFrontend implements TextDocumentService, WorkspaceService { diff --git a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/TextDocumentFrontend.java b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/TextDocumentFrontend.java index 0eb5d78b5a..ed6c9177ee 100644 --- a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/TextDocumentFrontend.java +++ b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/TextDocumentFrontend.java @@ -287,7 +287,13 @@ protected List> documentSymbol(Resourc } XtextResource res = rtc.getResource(); XDocument doc = rtc.getDocument(); - return documentSymbolService.getSymbols(doc, res, params, cancelIndicator); + List docSymbols = documentSymbolService.getSymbols(doc, res, params, cancelIndicator); + + List> result = new ArrayList<>(); + for (DocumentSymbol docSymbol : docSymbols) { + result.add(Either.forRight(docSymbol)); + } + return result; } @Override diff --git a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/WorkspaceFrontend.java b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/WorkspaceFrontend.java index 7f0d10918f..ffce0d98bf 100644 --- a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/WorkspaceFrontend.java +++ b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/WorkspaceFrontend.java @@ -32,7 +32,7 @@ /** * Handles all lsp calls that refer to the whole workspace, i.e. do not specify a specific test document. */ -@SuppressWarnings({ "restriction", "deprecation" }) +@SuppressWarnings({ "restriction" }) @Singleton public class WorkspaceFrontend { @Inject @@ -68,7 +68,8 @@ public CompletableFuture, List, List> symbol( WorkspaceSymbolParams params, CancelIndicator cancelIndicator) { XChunkedResourceDescriptions liveScopeIndex = resourceTaskManager.createLiveScopeIndex(); - return workspaceSymbolService.getSymbols(params.getQuery(), resourceAccess, liveScopeIndex, cancelIndicator); + return Either.forRight( + workspaceSymbolService.getSymbols(params.getQuery(), resourceAccess, liveScopeIndex, cancelIndicator)); } /** Execute the given command. */ diff --git a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/symbol/XDocumentSymbolService.java b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/symbol/XDocumentSymbolService.java index d805af7ef3..858fea2127 100644 --- a/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/symbol/XDocumentSymbolService.java +++ b/plugins/org.eclipse.n4js.xtext.ide/src/org/eclipse/n4js/xtext/ide/server/symbol/XDocumentSymbolService.java @@ -16,9 +16,7 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.lsp4j.Location; -import org.eclipse.lsp4j.SymbolInformation; import org.eclipse.lsp4j.WorkspaceSymbol; -import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.eclipse.xtext.findReferences.IReferenceFinder; import org.eclipse.xtext.findReferences.IReferenceFinder.IResourceAccess; import org.eclipse.xtext.findReferences.ReferenceAcceptor; @@ -43,7 +41,7 @@ * Minor adjustments compared to the default {@link DocumentSymbolService}. */ @Singleton -@SuppressWarnings({ "restriction", "deprecation" }) +@SuppressWarnings({ "restriction" }) public class XDocumentSymbolService extends DocumentSymbolService { @Inject @@ -63,7 +61,7 @@ public class XDocumentSymbolService extends DocumentSymbolService { // Overridden to wrap the call to #createSymbol inside resourceAccess.readOnly to re-use ResourceTaskContext @Override - public List getSymbols(IResourceDescription resourceDescription, String query, + public List getSymbols(IResourceDescription resourceDescription, String query, IResourceAccess resourceAccess, CancelIndicator cancelIndicator) { List matchingObjects = CollectionLiterals.newLinkedList(); @@ -78,9 +76,9 @@ public List getSymbols(IResourceDescription resourc return CollectionLiterals.newLinkedList(); } - AtomicReference> refSymbols = new AtomicReference<>(CollectionLiterals.newLinkedList()); + AtomicReference> refSymbols = new AtomicReference<>(CollectionLiterals.newLinkedList()); resourceAccess.readOnly(resourceDescription.getURI(), (resourceSet) -> { - List symbols = refSymbols.get(); + List symbols = refSymbols.get(); for (IEObjectDescription description : matchingObjects) { operationCanceledManager.checkCanceled(cancelIndicator); createSymbol(description, resourceAccess, symbol -> symbols.add(symbol)); @@ -123,20 +121,12 @@ public List getWorkspaceSymbols(IResourceDescription IResourceAccess resourceAccess, CancelIndicator cancelIndicator) { List wSymbols = new ArrayList<>(); - for (SymbolInformation symbol : getSymbols(resourceDescription, query, resourceAccess, cancelIndicator)) { - wSymbols.add(convert(symbol)); + for (WorkspaceSymbol symbol : getSymbols(resourceDescription, query, resourceAccess, cancelIndicator)) { + wSymbols.add(symbol); } return wSymbols; } - private WorkspaceSymbol convert(SymbolInformation symbol) { - return new WorkspaceSymbol( - symbol.getName(), - symbol.getKind(), - Either.forLeft(symbol.getLocation()), - symbol.getContainerName()); - } - /** * Same as {@link #getReferences(XtextResource, int, IResourceAccess, IResourceDescriptions, CancelIndicator)}, but * a custom reference acceptor can be provided. diff --git a/plugins/org.eclipse.n4js.xtext/.classpath b/plugins/org.eclipse.n4js.xtext/.classpath index e3816396dd..bc6087ae29 100644 --- a/plugins/org.eclipse.n4js.xtext/.classpath +++ b/plugins/org.eclipse.n4js.xtext/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/plugins/org.eclipse.n4js.xtext/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js.xtext/.settings/org.eclipse.jdt.core.prefs index f22022d1bb..af31e52a48 100644 --- a/plugins/org.eclipse.n4js.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js.xtext/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js.xtext/META-INF/MANIFEST.MF index 1985716656..a1d510ead7 100644 --- a/plugins/org.eclipse.n4js.xtext/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js.xtext/META-INF/MANIFEST.MF @@ -17,4 +17,3 @@ Require-Bundle: org.eclipse.core.runtime, Export-Package: org.eclipse.n4js.xtext.resource, org.eclipse.n4js.xtext.workspace Automatic-Module-Name: org.eclipse.n4js.xtext -Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/org.eclipse.n4js/.classpath b/plugins/org.eclipse.n4js/.classpath index c2540276ae..84ebbe0fe5 100644 --- a/plugins/org.eclipse.n4js/.classpath +++ b/plugins/org.eclipse.n4js/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/org.eclipse.n4js/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.n4js/.settings/org.eclipse.jdt.core.prefs index f8f455c60f..5a7308d665 100644 --- a/plugins/org.eclipse.n4js/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.n4js/.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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -50,6 +50,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning @@ -108,6 +109,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warn org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=enabled @@ -146,7 +148,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/plugins/org.eclipse.n4js/META-INF/MANIFEST.MF b/plugins/org.eclipse.n4js/META-INF/MANIFEST.MF index 922ac52fb0..d29950966c 100644 --- a/plugins/org.eclipse.n4js/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.n4js/META-INF/MANIFEST.MF @@ -41,7 +41,6 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport, com.fasterxml.jackson.core.jackson-databind, com.fasterxml.jackson.core.jackson-annotations, com.google.gson -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js, org.eclipse.n4js.formatting2, org.eclipse.n4js.generator, diff --git a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/generator/GeneratorOption.java b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/generator/GeneratorOption.java index ac418d77c1..22efe68ba6 100644 --- a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/generator/GeneratorOption.java +++ b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/generator/GeneratorOption.java @@ -102,7 +102,7 @@ public boolean isActiveIn(GeneratorOption... activeOptions) { /** Tells if the given optionToTest is among the given active options or their included options. */ public static final boolean isActiveIn(GeneratorOption optionToTest, GeneratorOption... activeOptions) { - return isActiveIn(new RecursionGuard(), optionToTest, activeOptions); + return isActiveIn(new RecursionGuard<>(), optionToTest, activeOptions); } private static final boolean isActiveIn(RecursionGuard guard, GeneratorOption optionToTest, diff --git a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/utils/PromisifyHelper.xtend b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/utils/PromisifyHelper.xtend index 106c2df1c4..e103b8a765 100644 --- a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/utils/PromisifyHelper.xtend +++ b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/utils/PromisifyHelper.xtend @@ -51,7 +51,11 @@ class PromisifyHelper { * Checks if the given function or method may be annotated with @Promisifiable. */ def public CheckResult checkPromisifiablePreconditions(FunctionDefinition funDef) { - val lastFpar = (funDef.definedType as TFunction)?.fpars?.last; + val tFun = funDef.definedType as TFunction; + if (tFun === null || tFun.fpars.isEmpty) { + return CheckResult.MISSING_CALLBACK; + } + val lastFpar = tFun.fpars.last; val lastFparTypeRef = lastFpar?.typeRef; if(!(lastFparTypeRef instanceof FunctionTypeExprOrRef)) { // error: last fpar of promisifiable function/method must be a function (i.e. the callback) diff --git a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSImportValidator.xtend b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSImportValidator.xtend index 5a2b8422b5..c5fe810840 100644 --- a/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSImportValidator.xtend +++ b/plugins/org.eclipse.n4js/src/org/eclipse/n4js/validation/validators/N4JSImportValidator.xtend @@ -10,15 +10,16 @@ */ package org.eclipse.n4js.validation.validators +import com.google.inject.Inject import java.util.List import java.util.Map -import javax.inject.Inject import org.eclipse.emf.common.notify.Notifier import org.eclipse.emf.ecore.EObject import org.eclipse.n4js.n4JS.EmptyStatement import org.eclipse.n4js.n4JS.ExportDeclaration import org.eclipse.n4js.n4JS.ImportDeclaration import org.eclipse.n4js.n4JS.ImportSpecifier +import org.eclipse.n4js.n4JS.N4JSASTUtils import org.eclipse.n4js.n4JS.N4JSPackage import org.eclipse.n4js.n4JS.NamedImportSpecifier import org.eclipse.n4js.n4JS.NamespaceImportSpecifier @@ -41,7 +42,6 @@ import org.eclipse.xtext.validation.EValidatorRegistrar import static org.eclipse.n4js.validation.IssueCodes.* -import static extension org.eclipse.n4js.n4JS.N4JSASTUtils.* import static extension org.eclipse.n4js.tooling.organizeImports.ImportSpecifiersUtil.* /** Validations for the import statements. */ @@ -210,7 +210,7 @@ class N4JSImportValidator extends AbstractN4JSDeclarativeValidator { var boolean stillInHeader = true for (se : script.scriptElements) { if (stillInHeader) { - if (! ( se instanceof ImportDeclaration || se instanceof EmptyStatement || se.isStringLiteralExpression )) stillInHeader = false; + if (! ( se instanceof ImportDeclaration || se instanceof EmptyStatement || N4JSASTUtils.isStringLiteralExpression(se) )) stillInHeader = false; } else { if (se instanceof ImportDeclaration) handleScatteredImport(se) } diff --git a/releng/org.eclipse.n4js.libs.build/.classpath b/releng/org.eclipse.n4js.libs.build/.classpath index 3628e33687..2869279ea3 100644 --- a/releng/org.eclipse.n4js.libs.build/.classpath +++ b/releng/org.eclipse.n4js.libs.build/.classpath @@ -1,6 +1,6 @@ - + diff --git a/releng/org.eclipse.n4js.libs.build/.settings/org.eclipse.jdt.core.prefs b/releng/org.eclipse.n4js.libs.build/.settings/org.eclipse.jdt.core.prefs index 83dda52831..1af03f4c10 100644 --- a/releng/org.eclipse.n4js.libs.build/.settings/org.eclipse.jdt.core.prefs +++ b/releng/org.eclipse.n4js.libs.build/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -132,7 +132,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/releng/org.eclipse.n4js.libs.build/META-INF/MANIFEST.MF b/releng/org.eclipse.n4js.libs.build/META-INF/MANIFEST.MF index 548634d685..be54d3b1c5 100644 --- a/releng/org.eclipse.n4js.libs.build/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.n4js.libs.build/META-INF/MANIFEST.MF @@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.n4js.libs.build;singleton:=true Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Require-Bundle: com.google.guava, org.eclipse.emf.mwe2.launch, diff --git a/releng/org.eclipse.n4js.parent/pom.xml b/releng/org.eclipse.n4js.parent/pom.xml index 51a39ec8b1..d0a02f03ab 100644 --- a/releng/org.eclipse.n4js.parent/pom.xml +++ b/releng/org.eclipse.n4js.parent/pom.xml @@ -29,13 +29,13 @@ Contributors: - 17 + 21 - 17 + 21 ${jdk-version} ${jdk-version} - 3.9.0 + 3.9.6 UTF-8 @@ -44,38 +44,38 @@ Contributors: ${project.encoding} - 3.0.3 + 4.0.7 - 2.29.0 + 2.33.0 - 3.3.0 - 3.0 + 3.4.0 + 3.2.0 1.0.1 3.1.0 3.6.0 1.0.0 - 3.4.2 - 3.2.0 - 3.10.1 - 3.5.0 - 3.1.0 - 3.2.1 - 3.1.0 - 3.3.0 - 3.5.0 - 3.3.0 - 3.20.0 - 3.0.0-M7 - 3.3.0 - 1.13.0 - 3.12.1 - 3.0.0-M9 + 3.6.0 + 3.3.2 + 3.11.0 + 3.6.1 + 3.1.1 + 3.4.1 + 3.1.1 + 3.6.2 + 3.3.1 + 3.21.2 + 3.0.1 + 3.3.1 + 2.0.1 + 4.0.0-M11 + 3.2.2 1.1 1.8 + 3.3.0 1.0.5 - 3.4.1 + 3.5.1 @@ -401,6 +401,10 @@ Contributors: fail + + tycho-snapshots + https://repo.eclipse.org/content/repositories/tycho-snapshots/ + diff --git a/releng/org.eclipse.n4js.releng.utils/.classpath b/releng/org.eclipse.n4js.releng.utils/.classpath index 3628e33687..2869279ea3 100644 --- a/releng/org.eclipse.n4js.releng.utils/.classpath +++ b/releng/org.eclipse.n4js.releng.utils/.classpath @@ -1,6 +1,6 @@ - + diff --git a/releng/org.eclipse.n4js.releng.utils/.settings/org.eclipse.jdt.core.prefs b/releng/org.eclipse.n4js.releng.utils/.settings/org.eclipse.jdt.core.prefs index a8427eceb5..6c3c1e6872 100644 --- a/releng/org.eclipse.n4js.releng.utils/.settings/org.eclipse.jdt.core.prefs +++ b/releng/org.eclipse.n4js.releng.utils/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/releng/org.eclipse.n4js.releng.utils/META-INF/MANIFEST.MF b/releng/org.eclipse.n4js.releng.utils/META-INF/MANIFEST.MF index d4f10508ea..3912f87833 100644 --- a/releng/org.eclipse.n4js.releng.utils/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.n4js.releng.utils/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.releng.utils Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext.xtext.generator, org.eclipse.emf.ecore.xcore, org.eclipse.emf.ecore, diff --git a/releng/org.eclipse.n4js.targetplatform/N4JS.setup b/releng/org.eclipse.n4js.targetplatform/N4JS.setup index 6bbff58320..89f1bda737 100644 --- a/releng/org.eclipse.n4js.targetplatform/N4JS.setup +++ b/releng/org.eclipse.n4js.targetplatform/N4JS.setup @@ -127,8 +127,8 @@ + version="JavaSE-21" + location="${jre.location-21}"> Define the JRE needed to compile and run the Java projects of ${scope.project.label} @@ -162,11 +162,11 @@ + value="N4JS_2023_09" + label="N4JS_2023_09"/> + versionRange="[2.32.0,2.32.1)"/> + versionRange="[2.32.0,2.32.1)"/> + url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0"/> Install Xtext and Xtend for ${scope.project.label} + versionRange="[2.15.0,2.15.1)"/> + url="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0"/> Install MWE2 for ${scope.project.label} - - - - @@ -330,30 +321,25 @@ + name="N4JS_2023_09"> + url="http://download.eclipse.org/releases/2023-09/202309131000"/> + url="http://download.eclipse.org/modeling/emf/emf/builds/release/2.35.0"/> + url="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0"/> - - + url="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0"/> + url="http://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/> + url="http://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository"/> The dynamic working sets for ${scope.project.label} - + diff --git a/releng/org.eclipse.n4js.targetplatform/org.eclipse.n4js.targetplatform.target b/releng/org.eclipse.n4js.targetplatform/org.eclipse.n4js.targetplatform.target index 928954ae96..1e9f292a91 100644 --- a/releng/org.eclipse.n4js.targetplatform/org.eclipse.n4js.targetplatform.target +++ b/releng/org.eclipse.n4js.targetplatform/org.eclipse.n4js.targetplatform.target @@ -1,62 +1,66 @@ - + - - - - - - - - - + + + + + + + + - - + + + + - + - + - - - - - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + + + - - + - - + + + + + + diff --git a/testhelpers/org.eclipse.n4js.cli.tests.helper/.classpath b/testhelpers/org.eclipse.n4js.cli.tests.helper/.classpath index 3628e33687..2869279ea3 100644 --- a/testhelpers/org.eclipse.n4js.cli.tests.helper/.classpath +++ b/testhelpers/org.eclipse.n4js.cli.tests.helper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/testhelpers/org.eclipse.n4js.cli.tests.helper/.settings/org.eclipse.jdt.core.prefs b/testhelpers/org.eclipse.n4js.cli.tests.helper/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/testhelpers/org.eclipse.n4js.cli.tests.helper/.settings/org.eclipse.jdt.core.prefs +++ b/testhelpers/org.eclipse.n4js.cli.tests.helper/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/testhelpers/org.eclipse.n4js.cli.tests.helper/META-INF/MANIFEST.MF b/testhelpers/org.eclipse.n4js.cli.tests.helper/META-INF/MANIFEST.MF index 93158db2df..023467a9e5 100644 --- a/testhelpers/org.eclipse.n4js.cli.tests.helper/META-INF/MANIFEST.MF +++ b/testhelpers/org.eclipse.n4js.cli.tests.helper/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.cli.tests.helper Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.xtext, org.eclipse.n4js.xtext.ide, diff --git a/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4CliHelper.java b/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4CliHelper.java index 321cbe15b6..7d7136b7e6 100644 --- a/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4CliHelper.java +++ b/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4CliHelper.java @@ -10,9 +10,9 @@ */ package org.eclipse.n4js.cli.helper; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; @@ -236,7 +236,7 @@ public static void assertContainsString(String toFind, File log) { * file to scan */ public static void assertNotContainsString(String toFind, File log) { - assertThat("unexpected string '" + toFind + "' found in log", readLogfile(log).indexOf(toFind) < 0); + assertTrue("unexpected string '" + toFind + "' found in log", readLogfile(log).indexOf(toFind) < 0); } /** diff --git a/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4jscTestLanguageClient.java b/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4jscTestLanguageClient.java index f5604e106a..0bbf685f82 100644 --- a/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4jscTestLanguageClient.java +++ b/testhelpers/org.eclipse.n4js.cli.tests.helper/src/org/eclipse/n4js/cli/helper/N4jscTestLanguageClient.java @@ -100,7 +100,7 @@ public void afterGenerate(URI source, URI generated) { Path folder = URIUtils.toPath(generated.trimSegments(1)); URI relGenerated = lspBuilder.makeWorkspaceRelative(generated); File relFile = URIUtils.toFile(relGenerated); - transpiledFiles.computeIfAbsent(folder, f -> Collections.synchronizedSet(new HashSet())).add(relFile); + transpiledFiles.computeIfAbsent(folder, f -> Collections.synchronizedSet(new HashSet<>())).add(relFile); } @Override diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/.classpath b/testhelpers/org.eclipse.n4js.ide.tests.helper/.classpath index 3628e33687..2869279ea3 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/.classpath +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/.settings/org.eclipse.jdt.core.prefs b/testhelpers/org.eclipse.n4js.ide.tests.helper/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/.settings/org.eclipse.jdt.core.prefs +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/META-INF/MANIFEST.MF b/testhelpers/org.eclipse.n4js.ide.tests.helper/META-INF/MANIFEST.MF index 955d86a871..04e03559d9 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/META-INF/MANIFEST.MF +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Version: 0.0.1.qualifier Bundle-SymbolicName: org.eclipse.n4js.ide.tests.helper -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.xtext, org.eclipse.n4js.xtext.ide, @@ -12,7 +11,6 @@ Require-Bundle: org.eclipse.n4js, org.eclipse.equinox.app, com.google.guava, org.apache.log4j, - org.slf4j.api;bundle-version="1.7.2", org.eclipse.n4js.utils, org.eclipse.xtext.testing, org.eclipse.n4js.tests.helper, @@ -23,9 +21,9 @@ Require-Bundle: org.eclipse.n4js, org.eclipse.lsp4j, org.eclipse.lsp4j.jsonrpc, org.eclipse.n4js.cli, - org.eclipse.xpect, org.eclipse.n4js.flowgraphs, - org.eclipse.n4js.jsdoc2spec + org.eclipse.n4js.jsdoc2spec, + org.junit Export-Package: org.eclipse.n4js.ide.tests.helper.client, org.eclipse.n4js.ide.tests.helper.server, org.eclipse.n4js.ide.tests.helper.server.xt diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractDocumentSymbolTest.java b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractDocumentSymbolTest.java index f736bb1cd6..7199e6b3ec 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractDocumentSymbolTest.java +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractDocumentSymbolTest.java @@ -29,10 +29,8 @@ /** * Abstract test class for definition protocol tests. */ -@SuppressWarnings("deprecation") abstract public class AbstractDocumentSymbolTest extends AbstractStructuredIdeTest { - public static class DocumentSymbolConfig { String expectation; diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractWorkspaceSymbolTest.java b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractWorkspaceSymbolTest.java index 16e5dc15ef..ef3299961f 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractWorkspaceSymbolTest.java +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/AbstractWorkspaceSymbolTest.java @@ -28,10 +28,8 @@ /** * Abstract test class for definition protocol tests. */ -@SuppressWarnings("deprecation") abstract public class AbstractWorkspaceSymbolTest extends AbstractStructuredIdeTest { - public static class WorkspaceSymbolConfig { WorkspaceSymbolParams params; String expectation; diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtFileRunner.java b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtFileRunner.java index f71bbbff41..ea0d3c26d4 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtFileRunner.java +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtFileRunner.java @@ -15,7 +15,6 @@ import java.util.Set; import org.junit.runner.Description; -import org.junit.runner.Result; import org.junit.runner.Runner; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunNotifier; diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtIdeTest.java b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtIdeTest.java index 2b998542b6..f4ee273f8c 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtIdeTest.java +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtIdeTest.java @@ -64,7 +64,6 @@ import org.eclipse.n4js.ts.types.TMember; import org.eclipse.n4js.utils.Strings; import org.eclipse.n4js.workspace.locations.FileURI; -import org.eclipse.xpect.runner.Xpect; import org.eclipse.xtext.naming.QualifiedName; import org.eclipse.xtext.resource.XtextResource; @@ -345,7 +344,6 @@ public void invokeTestMethod(XtMethodData testMethodData) throws Exception { * // XPECT noerrors --> * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void noerrors(XtMethodData data) { issueHelper.getNoerrors(data); } @@ -357,7 +355,6 @@ public void noerrors(XtMethodData data) { * // XPECT nowarnings --> * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void nowarnings(XtMethodData data) { issueHelper.getNowarnings(data); } @@ -370,7 +367,6 @@ public void nowarnings(XtMethodData data) { * // XPECT errors --> "<MESSAGE>" at "<LOCATION>" * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void errors(XtMethodData data) { issueHelper.getErrors(data); } @@ -383,7 +379,6 @@ public void errors(XtMethodData data) { * // XPECT warnings --> "<MESSAGE>" at "<LOCATION>" * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void warnings(XtMethodData data) { issueHelper.getWarnings(data); } @@ -395,7 +390,6 @@ public void warnings(XtMethodData data) { * // XPECT ast --> <SERIALIZED AST> * */ - @Xpect public void ast(XtMethodData data) { EObject root = resource.getParseResult().getRootASTElement(); String ast = xtMethods.serializeAst(root); @@ -413,7 +407,6 @@ public void ast(XtMethodData data) { * * The location is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void accessModifier(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "accessModifier", "at"); String accessModifierStr = XtMethods.getAccessModifierString(ocr.getEObject()); @@ -431,7 +424,6 @@ public void accessModifier(XtMethodData data) { * {@code apply}, {@code contains}, and {@code not} are optional.
* COMPLETIONS is a comma separated list.
*/ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void completion(XtMethodData data) throws InterruptedException, ExecutionException { Position position = eobjProvider.checkAndGetPosition(data, "completion", "at"); FileURI uri = getFileURIFromModuleName(xtData.workspace.moduleNameOfXtFile); @@ -493,7 +485,6 @@ public void completion(XtMethodData data) throws InterruptedException, Execution * // XPECT definition --> <FILE AND RANGE> * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void definition(XtMethodData data) throws InterruptedException, ExecutionException { Position position = eobjProvider.checkAndGetPosition(data, "definition", "at"); FileURI uri = getFileURIFromModuleName(xtData.workspace.moduleNameOfXtFile); @@ -516,7 +507,6 @@ public void definition(XtMethodData data) throws InterruptedException, Execution * * The location is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void elementKeyword(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "elementKeyword", "at"); String elementKeywordStr = xtMethods.getElementKeywordString(ocr); @@ -532,7 +522,6 @@ public void elementKeyword(XtMethodData data) { * * EXPORTED OBJECTS is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void exportedObjects(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "exportedObjects", null); List exportedObjectsArray = xtMethods.getExportedObjectsString(ocr); @@ -549,7 +538,6 @@ public void exportedObjects(XtMethodData data) { * * The location is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void findReferences(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "findReferences", "at"); List findReferencesArray = xtMethods.getFindReferences(ocr); @@ -564,7 +552,6 @@ public void findReferences(XtMethodData data) { * // XPECT formattedLines --> <FORMATTED LINES> * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void formattedLines(XtMethodData data, Map preferences) { String argLines = eobjProvider.checkAndGetArgAfter(data, "formattedLines"); int lines = Integer.parseInt(argLines); @@ -578,7 +565,6 @@ public void formattedLines(XtMethodData data, Map preferences) { * // XPECT linkedName at '<LOCATION>' --> <TYPE NAME> * */ - @Xpect public void linkedName(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "linkedName", "at"); QualifiedName linkedName = xtMethods.getLinkedName(ocr); @@ -590,7 +576,6 @@ public void linkedName(XtMethodData data) { * // XPECT linkedFragment at '<LOCATION>' --> <FRAGMENT NAME> * */ - @Xpect public void linkedFragment(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "linkedFragment", "at"); String fragmentName = xtMethods.getLinkedFragment(ocr); @@ -608,7 +593,6 @@ public void linkedFragment(XtMethodData data) { * // XPECT linkedPathname at '<LOCATION>' --> <PATH NAME> * */ - @Xpect public void linkedPathname(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "linkedPathname", "at"); String pathName = xtMethods.getLinkedPathname(ocr); @@ -625,7 +609,6 @@ public void linkedPathname(XtMethodData data) { * * {@code resource} is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void renameRefactoring(XtMethodData data) throws InterruptedException, ExecutionException { FileURI uri = getFileURIFromModuleName(xtData.workspace.moduleNameOfXtFile); Position pos = eobjProvider.checkAndGetPosition(data, "renameRefactoring", "at"); @@ -699,7 +682,6 @@ public void renameRefactoring(XtMethodData data) throws InterruptedException, Ex * // XPECT compileResult --> <COMPILE RESULT> * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void compileResult(XtMethodData data) { FileURI fileUri = getGeneratedFileURI(); String generedFileContent = getContentOfFileOnDisk(fileUri); @@ -713,7 +695,6 @@ public void compileResult(XtMethodData data) { * // XPECT output --> <OUTPUT> * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void output(XtMethodData data) { FileURI fileUri = getGeneratedFileURI(); @@ -746,7 +727,6 @@ private FileURI getGeneratedFileURI() { * // --- * */ - @Xpect public void generated_dts(XtMethodData data) throws IOException { String moduleName = xtData.workspace.moduleNameOfXtFile; int idxStart = Math.max(moduleName.lastIndexOf("/") + 1, 0); @@ -823,7 +803,6 @@ private void ensureTSC(CliTools cliTools) { * * The location is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void binding(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "binding", "at"); String bindingName = xtMethods.getBindingName(ocr); @@ -841,7 +820,6 @@ public void binding(XtMethodData data) { * * SCOPES is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void scope(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "scope", "at"); Set scopeStr = xtMethods.getScopeString(ocr); @@ -859,7 +837,6 @@ public void scope(XtMethodData data) { * * SCOPES WITH RESOURCE AND POSITION is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void scopeWithPosition(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "scopeWithPosition", "at"); Set scopeStr = xtMethods.getScopeWithPositionString(ocr); @@ -877,7 +854,6 @@ public void scopeWithPosition(XtMethodData data) { * * SCOPES WITH RESOURCE is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void scopeWithResource(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "scopeWithResource", "at"); Set scopeStr = xtMethods.getScopeWithResourceString(ocr); @@ -893,7 +869,6 @@ public void scopeWithResource(XtMethodData data) { * * The location is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void expectedType(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "expectedType", "at"); String typeStr = xtMethods.getTypeString(ocr.getEObject(), true, false); @@ -909,7 +884,6 @@ public void expectedType(XtMethodData data) { * * The location is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void type(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "type", "of"); String typeStr = xtMethods.getTypeString(ocr.getEObject(), false, false); @@ -933,7 +907,6 @@ public void type(XtMethodData data) { * Note that the offset denotes the target(!) of the call expression, not the call expression itself. Usually it is * enough to provide the last IdentifierRef before the call expression's parentheses. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void typeArgs(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "typeArgs", "of"); String typeArgStr = xtMethods.getTypeArgumentsString(ocr.getEObject()); @@ -949,7 +922,6 @@ public void typeArgs(XtMethodData data) { * * The location is optional. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void typeWithAliasResolution(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "typeWithAliasResolution", "of"); @@ -970,7 +942,6 @@ public void typeWithAliasResolution(XtMethodData data) { * * BRANCHES is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void allBranches(XtMethodData data) { Match match = PATTERN_ALLBRANCHES.match(data, eobjProvider); String direction = match.getText("direction"); @@ -989,7 +960,6 @@ public void allBranches(XtMethodData data) { * * EDGES is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void allEdges(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "allEdges", "from"); List pathStrings = xtFlowgraphs.getAllEdges(ocr); @@ -1007,7 +977,6 @@ public void allEdges(XtMethodData data) { * * MERGE BRANCHES is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void allMergeBranches(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "allMergeBranches", null); List edgeStrings = xtFlowgraphs.getAllMergeBranches(ocr); @@ -1026,7 +995,6 @@ public void allMergeBranches(XtMethodData data) { * * PATHS is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void allPaths(XtMethodData data) { Match match = PATTERN_ALLPATHS.match(data, eobjProvider); String direction = match.getText("direction"); @@ -1045,7 +1013,6 @@ public void allPaths(XtMethodData data) { * * AST ORDER is a comma separated list of ast elements. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void astOrder(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "astOrder", "of"); List astElements = xtFlowgraphs.getAstOrder(ocr); @@ -1061,7 +1028,6 @@ public void astOrder(XtMethodData data) { * * CONTROL FLOW CONTAINER is the name of an ast element. **/ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void cfContainer(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "cfContainer", "of"); String containerStr = xtFlowgraphs.getCfContainer(ocr); @@ -1077,7 +1043,6 @@ public void cfContainer(XtMethodData data) { * * COMMON PREDECESSORS is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void commonPreds(XtMethodData data) { Match match = PATTERN_COMMONPREDS.match(data, eobjProvider); IEObjectCoveringRegion ocrA = match.getEObjectWithOffset("of"); @@ -1095,7 +1060,6 @@ public void commonPreds(XtMethodData data) { * * GUARDS is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void instanceofguard(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "instanceofguard", "of"); List guardStrs = xtFlowgraphs.getInstanceofguard(ocr); @@ -1112,7 +1076,6 @@ public void instanceofguard(XtMethodData data) { * * Arguments 'to', 'notTo', 'via', 'notVia' are optional. Either 'to' or 'notTo' must be defined. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void path(XtMethodData data) { Match match = PATTERN_PATH.match(data, eobjProvider); IEObjectCoveringRegion ocrReference = match.ocrReference; @@ -1142,7 +1105,6 @@ public void path(XtMethodData data) { * PREDECESSORS is a comma separated list. * */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void preds(XtMethodData data) { Match match = PATTERN_PREDS.match(data, eobjProvider); String type = match.getText("type"); @@ -1164,7 +1126,6 @@ public void preds(XtMethodData data) { * * SUCCESSORS is a comma separated list. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void succs(XtMethodData data) { Match match = PATTERN_SUCCS.match(data, eobjProvider); String type = match.getText("type"); @@ -1182,7 +1143,6 @@ public void succs(XtMethodData data) { * * DOCUMENTATION generated from specs. */ - @Xpect // NOTE: This annotation is used only to enable validation and navigation of .xt files. public void specADoc(XtMethodData data) { IEObjectCoveringRegion ocr = eobjProvider.checkAndGetObjectCoveringRegion(data, "specADoc", null); String specADoc = xtMethods.getSpecADoc(ocr); diff --git a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtMethods.java b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtMethods.java index 7d16b123d9..0b387aa367 100644 --- a/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtMethods.java +++ b/testhelpers/org.eclipse.n4js.ide.tests.helper/src/org/eclipse/n4js/ide/tests/helper/server/xt/XtMethods.java @@ -70,7 +70,6 @@ import org.eclipse.n4js.validation.N4JSElementKeywordProvider; import org.eclipse.n4js.xtext.scoping.FilteringScope; import org.eclipse.n4js.xtext.scoping.IEObjectDescriptionWithError; -import org.eclipse.xpect.runner.Xpect; import org.eclipse.xtext.EcoreUtil2; import org.eclipse.xtext.common.types.access.TypeResource; import org.eclipse.xtext.formatting2.FormatterPreferenceKeys; @@ -268,7 +267,6 @@ public String getLinkedFragment(IEObjectCoveringRegion ocr) { } /** Implementation for {@link XtIdeTest#linkedName(XtMethodData)} */ - @Xpect public QualifiedName getLinkedName(IEObjectCoveringRegion ocr) { int offset = ocr.getOffset(); EObject eObject = ocr.getEObject(); diff --git a/testhelpers/org.eclipse.n4js.json.tests.helper/.classpath b/testhelpers/org.eclipse.n4js.json.tests.helper/.classpath index 3628e33687..2869279ea3 100644 --- a/testhelpers/org.eclipse.n4js.json.tests.helper/.classpath +++ b/testhelpers/org.eclipse.n4js.json.tests.helper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/testhelpers/org.eclipse.n4js.json.tests.helper/.settings/org.eclipse.jdt.core.prefs b/testhelpers/org.eclipse.n4js.json.tests.helper/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/testhelpers/org.eclipse.n4js.json.tests.helper/.settings/org.eclipse.jdt.core.prefs +++ b/testhelpers/org.eclipse.n4js.json.tests.helper/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/testhelpers/org.eclipse.n4js.json.tests.helper/META-INF/MANIFEST.MF b/testhelpers/org.eclipse.n4js.json.tests.helper/META-INF/MANIFEST.MF index d56cceb754..d9f0e10da0 100644 --- a/testhelpers/org.eclipse.n4js.json.tests.helper/META-INF/MANIFEST.MF +++ b/testhelpers/org.eclipse.n4js.json.tests.helper/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.json.tests.helper Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.json, org.eclipse.core.runtime, @@ -12,7 +11,7 @@ Require-Bundle: org.eclipse.n4js, org.eclipse.emf.codegen.ecore, org.eclipse.n4js.tests.helper, org.eclipse.n4js.json.model, - org.eclipse.xpect, + org.junit, com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/testhelpers/org.eclipse.n4js.regex.tests.helper/.classpath b/testhelpers/org.eclipse.n4js.regex.tests.helper/.classpath index 3628e33687..2869279ea3 100644 --- a/testhelpers/org.eclipse.n4js.regex.tests.helper/.classpath +++ b/testhelpers/org.eclipse.n4js.regex.tests.helper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/testhelpers/org.eclipse.n4js.regex.tests.helper/.settings/org.eclipse.jdt.core.prefs b/testhelpers/org.eclipse.n4js.regex.tests.helper/.settings/org.eclipse.jdt.core.prefs index e448d5fabf..395c0c221d 100644 --- a/testhelpers/org.eclipse.n4js.regex.tests.helper/.settings/org.eclipse.jdt.core.prefs +++ b/testhelpers/org.eclipse.n4js.regex.tests.helper/.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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -149,7 +149,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning 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=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/testhelpers/org.eclipse.n4js.regex.tests.helper/META-INF/MANIFEST.MF b/testhelpers/org.eclipse.n4js.regex.tests.helper/META-INF/MANIFEST.MF index b9d870f44b..5425b8fd13 100644 --- a/testhelpers/org.eclipse.n4js.regex.tests.helper/META-INF/MANIFEST.MF +++ b/testhelpers/org.eclipse.n4js.regex.tests.helper/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.n4js.regex, org.eclipse.xtext.testing, org.eclipse.xtend, org.eclipse.xtext.xbase.lib -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.regex, org.eclipse.n4js.regex.tests Automatic-Module-Name: org.eclipse.n4js.regex.tests.helper diff --git a/testhelpers/org.eclipse.n4js.semver.tests.helper/.classpath b/testhelpers/org.eclipse.n4js.semver.tests.helper/.classpath index 3628e33687..2869279ea3 100644 --- a/testhelpers/org.eclipse.n4js.semver.tests.helper/.classpath +++ b/testhelpers/org.eclipse.n4js.semver.tests.helper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/testhelpers/org.eclipse.n4js.semver.tests.helper/.settings/org.eclipse.jdt.core.prefs b/testhelpers/org.eclipse.n4js.semver.tests.helper/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/testhelpers/org.eclipse.n4js.semver.tests.helper/.settings/org.eclipse.jdt.core.prefs +++ b/testhelpers/org.eclipse.n4js.semver.tests.helper/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/testhelpers/org.eclipse.n4js.semver.tests.helper/META-INF/MANIFEST.MF b/testhelpers/org.eclipse.n4js.semver.tests.helper/META-INF/MANIFEST.MF index a9de08e6c9..ac004822ce 100644 --- a/testhelpers/org.eclipse.n4js.semver.tests.helper/META-INF/MANIFEST.MF +++ b/testhelpers/org.eclipse.n4js.semver.tests.helper/META-INF/MANIFEST.MF @@ -4,15 +4,14 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.semver.tests.helper Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.n4js.semver, +Require-Bundle: org.junit, + org.eclipse.n4js.semver, org.eclipse.core.runtime, org.eclipse.xtext.testing, org.eclipse.emf.codegen.ecore, org.eclipse.n4js.tests.helper, org.eclipse.n4js.semver.model, org.eclipse.n4js.utils, - org.eclipse.xpect, com.google.guava, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, diff --git a/testhelpers/org.eclipse.n4js.tests.helper/.classpath b/testhelpers/org.eclipse.n4js.tests.helper/.classpath index 3628e33687..2869279ea3 100644 --- a/testhelpers/org.eclipse.n4js.tests.helper/.classpath +++ b/testhelpers/org.eclipse.n4js.tests.helper/.classpath @@ -1,6 +1,6 @@ - + diff --git a/testhelpers/org.eclipse.n4js.tests.helper/.settings/org.eclipse.jdt.core.prefs b/testhelpers/org.eclipse.n4js.tests.helper/.settings/org.eclipse.jdt.core.prefs index db9f132376..c57ca7f4aa 100644 --- a/testhelpers/org.eclipse.n4js.tests.helper/.settings/org.eclipse.jdt.core.prefs +++ b/testhelpers/org.eclipse.n4js.tests.helper/.settings/org.eclipse.jdt.core.prefs @@ -29,9 +29,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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -137,7 +137,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/testhelpers/org.eclipse.n4js.tests.helper/META-INF/MANIFEST.MF b/testhelpers/org.eclipse.n4js.tests.helper/META-INF/MANIFEST.MF index 54e96c64d6..e4d093d6de 100644 --- a/testhelpers/org.eclipse.n4js.tests.helper/META-INF/MANIFEST.MF +++ b/testhelpers/org.eclipse.n4js.tests.helper/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.tests.helper Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Eclipse-BundleShape: dir Require-Bundle: org.eclipse.n4js, org.eclipse.core.runtime, diff --git a/testhelpers/org.eclipse.n4js.tests.helper/src/org/eclipse/n4js/tests/codegen/YarnWorkspaceProject.java b/testhelpers/org.eclipse.n4js.tests.helper/src/org/eclipse/n4js/tests/codegen/YarnWorkspaceProject.java index 28795ee0d0..37e9e63a34 100644 --- a/testhelpers/org.eclipse.n4js.tests.helper/src/org/eclipse/n4js/tests/codegen/YarnWorkspaceProject.java +++ b/testhelpers/org.eclipse.n4js.tests.helper/src/org/eclipse/n4js/tests/codegen/YarnWorkspaceProject.java @@ -91,7 +91,7 @@ public String generate() { } String workspaces = Strings.join(", ", ws -> "\"%s/*\"".formatted(ws), memberProjects.keySet()); - String deps = Strings.join(",\n", d -> "\"%s\": \"*\"".formatted(d), projectDependencies); + String deps = Strings.join(",\n\t\t", d -> "\"%s\": \"*\"".formatted(d), projectDependencies); return """ { diff --git a/tests/org.eclipse.n4js.accesscontrol.tests/.classpath b/tests/org.eclipse.n4js.accesscontrol.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.accesscontrol.tests/.classpath +++ b/tests/org.eclipse.n4js.accesscontrol.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.accesscontrol.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.accesscontrol.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.accesscontrol.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.accesscontrol.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.accesscontrol.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.accesscontrol.tests/META-INF/MANIFEST.MF index 2dbe398a29..acb324ab1f 100644 --- a/tests/org.eclipse.n4js.accesscontrol.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.accesscontrol.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.accesscontrol.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: com.google.inject, org.eclipse.xtext, org.eclipse.xtext.testing, diff --git a/tests/org.eclipse.n4js.bugreports.tests/.classpath b/tests/org.eclipse.n4js.bugreports.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.bugreports.tests/.classpath +++ b/tests/org.eclipse.n4js.bugreports.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.bugreports.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.bugreports.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.bugreports.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.bugreports.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.bugreports.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.bugreports.tests/META-INF/MANIFEST.MF index f6d4aa2455..07ee5d6067 100644 --- a/tests/org.eclipse.n4js.bugreports.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.bugreports.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.bugreports.tests;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, diff --git a/tests/org.eclipse.n4js.expectmatrix.tests/.classpath b/tests/org.eclipse.n4js.expectmatrix.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.expectmatrix.tests/.classpath +++ b/tests/org.eclipse.n4js.expectmatrix.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.expectmatrix.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.expectmatrix.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.expectmatrix.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.expectmatrix.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.expectmatrix.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.expectmatrix.tests/META-INF/MANIFEST.MF index 5c6f4c6f64..6dadd6d0e6 100644 --- a/tests/org.eclipse.n4js.expectmatrix.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.expectmatrix.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.expectmatrix.tests;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, diff --git a/tests/org.eclipse.n4js.flowgraphs.tests/.classpath b/tests/org.eclipse.n4js.flowgraphs.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.flowgraphs.tests/.classpath +++ b/tests/org.eclipse.n4js.flowgraphs.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.flowgraphs.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.flowgraphs.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.flowgraphs.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.flowgraphs.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.flowgraphs.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.flowgraphs.tests/META-INF/MANIFEST.MF index 344d25c95d..97fe8c52ca 100644 --- a/tests/org.eclipse.n4js.flowgraphs.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.flowgraphs.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.flowgraphs.tests;singleton:=true Bundle-Version: 0.0.1.qualifier Fragment-Host: org.eclipse.n4js -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.antlr.runtime, org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, diff --git a/tests/org.eclipse.n4js.ide.tests.helper.tests/.classpath b/tests/org.eclipse.n4js.ide.tests.helper.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.ide.tests.helper.tests/.classpath +++ b/tests/org.eclipse.n4js.ide.tests.helper.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.ide.tests.helper.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.ide.tests.helper.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.ide.tests.helper.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.ide.tests.helper.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.ide.tests.helper.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.ide.tests.helper.tests/META-INF/MANIFEST.MF index fcacd4260c..c911f2e411 100644 --- a/tests/org.eclipse.n4js.ide.tests.helper.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.ide.tests.helper.tests/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.n4js, org.eclipse.equinox.app, com.google.guava, org.apache.log4j, - org.slf4j.api;bundle-version="1.7.2", org.eclipse.n4js.utils, org.eclipse.xtext.testing, org.eclipse.n4js.tests.helper, @@ -19,7 +18,5 @@ Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.ide, org.eclipse.lsp4j, org.eclipse.lsp4j.jsonrpc, - org.eclipse.n4js.cli, - org.eclipse.xpect -Bundle-RequiredExecutionEnvironment: JavaSE-17 + org.eclipse.n4js.cli Automatic-Module-Name: org.eclipse.n4js.ide.tests diff --git a/tests/org.eclipse.n4js.ide.tests/.classpath b/tests/org.eclipse.n4js.ide.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.ide.tests/.classpath +++ b/tests/org.eclipse.n4js.ide.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.ide.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.ide.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.ide.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.ide.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.ide.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.ide.tests/META-INF/MANIFEST.MF index 71bfb85d65..1c1d4b8ec9 100644 --- a/tests/org.eclipse.n4js.ide.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.ide.tests/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Require-Bundle: org.junit, org.eclipse.equinox.app, com.google.guava, org.apache.log4j, - org.slf4j.api;bundle-version="1.7.2", org.eclipse.xtext.testing, org.eclipse.n4js, org.eclipse.n4js.ts.model, @@ -23,5 +22,4 @@ Require-Bundle: org.junit, org.eclipse.n4js.xtext.ide, org.eclipse.lsp4j, org.eclipse.lsp4j.jsonrpc -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.ide.tests diff --git a/tests/org.eclipse.n4js.integration.tests/.classpath b/tests/org.eclipse.n4js.integration.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.integration.tests/.classpath +++ b/tests/org.eclipse.n4js.integration.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.integration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.integration.tests/.settings/org.eclipse.jdt.core.prefs index d0cd3cd094..4dcbc097d2 100644 --- a/tests/org.eclipse.n4js.integration.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.integration.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.integration.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.integration.tests/META-INF/MANIFEST.MF index 8c8623cc69..ac0594a563 100644 --- a/tests/org.eclipse.n4js.integration.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.integration.tests/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.n4js, org.junit, com.google.guava, org.apache.log4j, - org.slf4j.api;bundle-version="1.7.2", org.eclipse.lsp4j, org.eclipse.xtext.testing, org.eclipse.n4js.ide, @@ -21,5 +20,4 @@ Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.ide.tests.helper, org.eclipse.n4js.smith, org.eclipse.n4js.dts -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.integration.tests diff --git a/tests/org.eclipse.n4js.jsdoc.tests/.classpath b/tests/org.eclipse.n4js.jsdoc.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.jsdoc.tests/.classpath +++ b/tests/org.eclipse.n4js.jsdoc.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.jsdoc.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.jsdoc.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.jsdoc.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.jsdoc.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.jsdoc.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.jsdoc.tests/META-INF/MANIFEST.MF index c5905382e2..2050ebacef 100644 --- a/tests/org.eclipse.n4js.jsdoc.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.jsdoc.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.jsdoc.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit, org.eclipse.n4js.jsdoc, org.eclipse.emf.ecore, diff --git a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/DocletParserTest.java b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/DocletParserTest.java index b08ce8fed5..4c8154a31c 100644 --- a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/DocletParserTest.java +++ b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/DocletParserTest.java @@ -15,15 +15,13 @@ import java.util.Arrays; import org.eclipse.emf.common.util.EList; -import org.junit.Test; - import org.eclipse.n4js.jsdoc.dom.Doclet; import org.eclipse.n4js.jsdoc.dom.LineTag; import org.eclipse.n4js.jsdoc.dom.Tag; import org.eclipse.n4js.jsdoc.dom.TagTitle; import org.eclipse.n4js.jsdoc.dom.Text; -import org.eclipse.n4js.jsdoc.tags.AbstractInlineTagDefinition; import org.eclipse.n4js.jsdoc.tags.AbstractLineTagDefinition; +import org.junit.Test; /** * General test for DocletParser. Checking how main parsing algorithm works. Description specific content is tested in @@ -36,7 +34,6 @@ public class DocletParserTest { */ public class StubLineTagDefinition extends AbstractLineTagDefinition { - public StubLineTagDefinition(String title) { setTitles(title); } @@ -48,13 +45,12 @@ public Tag parse(TagTitle title, JSDocCharScanner scanner, DescriptionParser des } } - @Test public void testJSDocParsing() { String in = "/** This is the description.\n * @stubLineTagTitle \n */"; AbstractLineTagDefinition tag = new StubLineTagDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); Text descr = (Text) doclet.getContents().get(0); @@ -64,20 +60,18 @@ public void testJSDocParsing() { assertEquals("stubLineTagTitle", lineTag.getTitle().getTitle()); } - @Test public void testJSDocParsingWithoutMainDescription() { String in = "/** \n * @stubLineTagTitle \n */"; AbstractLineTagDefinition tag = new StubLineTagDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); assertEquals("stubLineTagTitle", lineTag.getTitle().getTitle()); } - @Test public void testJSDocParsingWithManyLineTags() { String in = "/** \n * @stubLineTagTitle0 \n * @stubLineTagTitle1 \n * @stubLineTagTitle2 \n */"; @@ -85,7 +79,7 @@ public void testJSDocParsingWithManyLineTags() { AbstractLineTagDefinition tag1 = new StubLineTagDefinition("stubLineTagTitle1"); AbstractLineTagDefinition tag2 = new StubLineTagDefinition("stubLineTagTitle2"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag0, tag1, tag2)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); EList lineTags = doclet.getLineTags(); @@ -100,26 +94,24 @@ public void testJSDocParsingWithManyLineTags() { assertEquals("stubLineTagTitle2", lineTag2.getTitle().getTitle()); } - @Test public void testJSDocParsingWithoutLineTags() { String in = "/** Just free text.\n */"; AbstractLineTagDefinition tag = new StubLineTagDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); Text descr = (Text) doclet.getContents().get(0); assertEquals("Just free text.", descr.getText()); } - @Test public void testTrailingDescriptionIsIgnored() { String in = "/** This is the description.\n * @stubLineTagTitle \n * Trailing description.\n */"; AbstractLineTagDefinition tag = new StubLineTagDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); assertEquals(1, doclet.getContents().size()); @@ -131,7 +123,6 @@ public void testTrailingDescriptionIsIgnored() { assertEquals("stubLineTagTitle", lineTag.getTitle().getTitle()); } - @Test public void testTrailingDescriptionAndAllThatFollowsIsIgnored() { String in = "/** This is the description." + "\n * @stubLineTagTitle " + "\n * Trailing description." @@ -139,7 +130,7 @@ public void testTrailingDescriptionAndAllThatFollowsIsIgnored() { AbstractLineTagDefinition tag = new StubLineTagDefinition("stubLineTagTitle"); AbstractLineTagDefinition tag2 = new StubLineTagDefinition("stubLineTagTitle2"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag, tag2)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); assertEquals(1, doclet.getContents().size()); @@ -151,19 +142,17 @@ public void testTrailingDescriptionAndAllThatFollowsIsIgnored() { assertEquals("stubLineTagTitle", lineTag.getTitle().getTitle()); } - @Test public void testUnkonwLineTagIsIgnored() { String in = "/** \n * @unkonwTagTitle \n */"; AbstractLineTagDefinition tag = new StubLineTagDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); assertEquals(0, doclet.getLineTags().size()); } - @Test public void testParserResumesAfterUnkonwLineTag() { String in = "/** \n * @unkonwLineTag \n * @stubLineTagTitle1 \n * @stubLineTagTitle2 \n */"; @@ -171,7 +160,7 @@ public void testParserResumesAfterUnkonwLineTag() { AbstractLineTagDefinition tag1 = new StubLineTagDefinition("stubLineTagTitle1"); AbstractLineTagDefinition tag2 = new StubLineTagDefinition("stubLineTagTitle2"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag0, tag1, tag2)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); EList lineTags = doclet.getLineTags(); diff --git a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/InlineTagTest.java b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/InlineTagTest.java index 7455bfa616..611bde4ba6 100644 --- a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/InlineTagTest.java +++ b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/InlineTagTest.java @@ -38,7 +38,7 @@ public class InlineTagTest { public void testSimpleLineTag() { String in = "/** Some Description {@inline me} some other text. \n */"; AbstractInlineTagDefinition tag = new StubInlineTagDefinition("inline"); - DocletParser docletParser = new DocletParser(new TagDictionary(), + DocletParser docletParser = new DocletParser(new TagDictionary<>(), new TagDictionary<>(Arrays.asList(tag))); Doclet doclet = docletParser.parse(in); diff --git a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagTest.java b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagTest.java index 3ae3c7fe3b..06fa354d86 100644 --- a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagTest.java +++ b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagTest.java @@ -35,7 +35,7 @@ public void testSimpleLineTag() { String in = "/** foo.\n * @stubLineTagTitle\n */"; AbstractLineTagDefinition tag = new StubLineTagWithRegionDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); @@ -48,7 +48,7 @@ public void testLineTagWithRegion() { String in = "/** foo.\n * @stubLineTagTitle {@region value}\n */"; AbstractLineTagDefinition tag = new StubLineTagWithRegionDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); @@ -65,7 +65,7 @@ public void testLineTagDescrWithTrimmedSpace() { + "\n */"; AbstractLineTagDefinition tag = new StubLineTagWithRegionDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); @@ -83,7 +83,7 @@ public void testLineTagDescrWithOutSpace() { + "\n */"; AbstractLineTagDefinition tag = new StubLineTagWithRegionDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); @@ -99,7 +99,7 @@ public void testLineTagWithRegionAndDescr() { String in = "/** foo.\n * @stubLineTagTitle {@region value} tag description.\n */"; AbstractLineTagDefinition tag = new StubLineTagWithRegionDefinition("stubLineTagTitle"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tag)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); diff --git a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagWithFullMemberReferenceTest.java b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagWithFullMemberReferenceTest.java index 1985f59dc1..ac1564e162 100644 --- a/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagWithFullMemberReferenceTest.java +++ b/tests/org.eclipse.n4js.jsdoc.tests/src/org/eclipse/n4js/jsdoc/tags/LineTagWithFullMemberReferenceTest.java @@ -36,7 +36,7 @@ public void test_fullRef_simpleName() { + "\n */"; AbstractLineTagDefinition tagDef = new LineTagWithFullMemberReference("testee"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tagDef)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); @@ -58,7 +58,7 @@ public void test_fullRef_symbolName() { + "\n */"; AbstractLineTagDefinition tagDef = new LineTagWithFullMemberReference("testee"); DocletParser docletParser = new DocletParser(new TagDictionary<>(Arrays.asList(tagDef)), - new TagDictionary()); + new TagDictionary<>()); Doclet doclet = docletParser.parse(in); LineTag lineTag = doclet.getLineTags().get(0); diff --git a/tests/org.eclipse.n4js.jsdoc2spec.tests/.classpath b/tests/org.eclipse.n4js.jsdoc2spec.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.jsdoc2spec.tests/.classpath +++ b/tests/org.eclipse.n4js.jsdoc2spec.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.jsdoc2spec.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.jsdoc2spec.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.jsdoc2spec.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.jsdoc2spec.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.jsdoc2spec.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.jsdoc2spec.tests/META-INF/MANIFEST.MF index c0357da3d1..9e4320eb9d 100644 --- a/tests/org.eclipse.n4js.jsdoc2spec.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.jsdoc2spec.tests/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.jsdoc2spec.tests;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: org.eclipse.n4js.jsdoc2spec Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.ide, @@ -13,7 +12,7 @@ Require-Bundle: org.eclipse.n4js, org.eclipse.n4js.tests.helper, org.eclipse.xtext, org.eclipse.xtext.testing, - org.eclipse.xpect, + org.junit, org.eclipse.lsp4j Bundle-Vendor: %providerName Automatic-Module-Name: org.eclipse.n4js.jsdoc2spec.tests diff --git a/tests/org.eclipse.n4js.json.tests/.classpath b/tests/org.eclipse.n4js.json.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.json.tests/.classpath +++ b/tests/org.eclipse.n4js.json.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.json.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.json.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.json.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.json.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.json.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.json.tests/META-INF/MANIFEST.MF index e524c074b0..5b570f1880 100644 --- a/tests/org.eclipse.n4js.json.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.json.tests/META-INF/MANIFEST.MF @@ -13,5 +13,4 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.n4js.common.unicode, org.eclipse.lsp4j.jsonrpc, org.eclipse.lsp4j -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.json.tests diff --git a/tests/org.eclipse.n4js.json.xpect.tests/.classpath b/tests/org.eclipse.n4js.json.xpect.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.json.xpect.tests/.classpath +++ b/tests/org.eclipse.n4js.json.xpect.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.json.xpect.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.json.xpect.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.json.xpect.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.json.xpect.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.json.xpect.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.json.xpect.tests/META-INF/MANIFEST.MF index a3ac9b2a57..56704908d5 100644 --- a/tests/org.eclipse.n4js.json.xpect.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.json.xpect.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.json.xpect.tests Bundle-Version: 0.0.1.qualifier Fragment-Host: org.eclipse.n4js.json -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js.json.tests.helper, org.eclipse.n4js.ide.tests.helper, org.junit diff --git a/tests/org.eclipse.n4js.lang.tests/.classpath b/tests/org.eclipse.n4js.lang.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.lang.tests/.classpath +++ b/tests/org.eclipse.n4js.lang.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.lang.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.lang.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.lang.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.lang.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.lang.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.lang.tests/META-INF/MANIFEST.MF index 28c41063e2..fed77731d8 100644 --- a/tests/org.eclipse.n4js.lang.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.lang.tests/META-INF/MANIFEST.MF @@ -18,5 +18,4 @@ Require-Bundle: org.eclipse.n4js.ide, org.eclipse.xtext.ui, org.junit, org.eclipse.xtext.builder -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.lang.tests diff --git a/tests/org.eclipse.n4js.lang.tests/src/org/eclipse/n4js/tests/n4JS/extensions/SourceElementExtensionsTest.java b/tests/org.eclipse.n4js.lang.tests/src/org/eclipse/n4js/tests/n4JS/extensions/SourceElementExtensionsTest.java index 4134c4fb62..1eac131af2 100644 --- a/tests/org.eclipse.n4js.lang.tests/src/org/eclipse/n4js/tests/n4JS/extensions/SourceElementExtensionsTest.java +++ b/tests/org.eclipse.n4js.lang.tests/src/org/eclipse/n4js/tests/n4JS/extensions/SourceElementExtensionsTest.java @@ -19,8 +19,6 @@ import java.util.Objects; -import javax.inject.Inject; - import org.eclipse.n4js.N4JSInjectorProviderWithIssueSuppression; import org.eclipse.n4js.n4JS.Block; import org.eclipse.n4js.n4JS.FunctionExpression; @@ -38,6 +36,7 @@ import org.junit.runner.RunWith; import com.google.common.collect.Iterables; +import com.google.inject.Inject; @InjectWith(N4JSInjectorProviderWithIssueSuppression.class) @RunWith(XtextRunner.class) diff --git a/tests/org.eclipse.n4js.packagejson.xpect.tests/.classpath b/tests/org.eclipse.n4js.packagejson.xpect.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.packagejson.xpect.tests/.classpath +++ b/tests/org.eclipse.n4js.packagejson.xpect.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.packagejson.xpect.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.packagejson.xpect.tests/.settings/org.eclipse.jdt.core.prefs index 06dacb6715..077a83c6dc 100644 --- a/tests/org.eclipse.n4js.packagejson.xpect.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.packagejson.xpect.tests/.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=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error @@ -18,4 +18,4 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/tests/org.eclipse.n4js.packagejson.xpect.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.packagejson.xpect.tests/META-INF/MANIFEST.MF index 7001cf012b..aef009aa2a 100644 --- a/tests/org.eclipse.n4js.packagejson.xpect.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.packagejson.xpect.tests/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.n4js.packagejson.xpect.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: org.eclipse.n4js Automatic-Module-Name: org.eclipse.n4js.packagejson.xpect.tests -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.xpect, +Require-Bundle: org.junit, org.eclipse.n4js.json.tests.helper, org.eclipse.n4js.tests.helper, org.eclipse.n4js.json, diff --git a/tests/org.eclipse.n4js.regex.tests/.classpath b/tests/org.eclipse.n4js.regex.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.regex.tests/.classpath +++ b/tests/org.eclipse.n4js.regex.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.regex.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.regex.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.regex.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.regex.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.regex.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.regex.tests/META-INF/MANIFEST.MF index c32cdd75ba..898fe6097a 100644 --- a/tests/org.eclipse.n4js.regex.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.regex.tests/META-INF/MANIFEST.MF @@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.core.runtime, org.junit, org.eclipse.ui.workbench;resolution:=optional, org.objectweb.asm;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.regex.tests, org.eclipse.n4js.regex Automatic-Module-Name: org.eclipse.n4js.regex.tests diff --git a/tests/org.eclipse.n4js.releng.utils.tests/.classpath b/tests/org.eclipse.n4js.releng.utils.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.releng.utils.tests/.classpath +++ b/tests/org.eclipse.n4js.releng.utils.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.releng.utils.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.releng.utils.tests/.settings/org.eclipse.jdt.core.prefs index d0cd3cd094..4dcbc097d2 100644 --- a/tests/org.eclipse.n4js.releng.utils.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.releng.utils.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.releng.utils.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.releng.utils.tests/META-INF/MANIFEST.MF index 905937f97b..c85df18ab2 100644 --- a/tests/org.eclipse.n4js.releng.utils.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.releng.utils.tests/META-INF/MANIFEST.MF @@ -5,6 +5,5 @@ Bundle-SymbolicName: org.eclipse.n4js.releng.utils.tests Bundle-Vendor: %providerName Bundle-Version: 0.0.1.qualifier Fragment-Host: org.eclipse.n4js.releng.utils -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit Automatic-Module-Name: org.eclipse.n4js.releng.utils.tests diff --git a/tests/org.eclipse.n4js.semver.tests/.classpath b/tests/org.eclipse.n4js.semver.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.semver.tests/.classpath +++ b/tests/org.eclipse.n4js.semver.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.semver.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.semver.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.semver.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.semver.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.semver.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.semver.tests/META-INF/MANIFEST.MF index 89a9d49f73..4efa4d20de 100644 --- a/tests/org.eclipse.n4js.semver.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.semver.tests/META-INF/MANIFEST.MF @@ -10,5 +10,4 @@ Require-Bundle: org.eclipse.xtext.testing, org.eclipse.n4js.semver.tests.helper, org.eclipse.n4js.semver.model, org.eclipse.n4js.common.unicode -Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.n4js.semver.tests diff --git a/tests/org.eclipse.n4js.smoke.tests/.classpath b/tests/org.eclipse.n4js.smoke.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.smoke.tests/.classpath +++ b/tests/org.eclipse.n4js.smoke.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.smoke.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.smoke.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.smoke.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.smoke.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.smoke.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.smoke.tests/META-INF/MANIFEST.MF index 614a1f0454..8110528abf 100644 --- a/tests/org.eclipse.n4js.smoke.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.smoke.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.smoke.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtend.lib, com.google.guava, org.eclipse.xtext.xbase.lib, diff --git a/tests/org.eclipse.n4js.smoke.tests/src/org/eclipse/n4js/smoke/tests/UniqueScenarioProcessor.java b/tests/org.eclipse.n4js.smoke.tests/src/org/eclipse/n4js/smoke/tests/UniqueScenarioProcessor.java index 19e14e8575..1b9350e08f 100644 --- a/tests/org.eclipse.n4js.smoke.tests/src/org/eclipse/n4js/smoke/tests/UniqueScenarioProcessor.java +++ b/tests/org.eclipse.n4js.smoke.tests/src/org/eclipse/n4js/smoke/tests/UniqueScenarioProcessor.java @@ -47,7 +47,7 @@ abstract public class UniqueScenarioProcessor extends ScenarioProcessor { public UniqueScenarioProcessor() throws RuntimeException { try { messageDigest = MessageDigest.getInstance("MD5"); - seen = Collections.newSetFromMap(new ConcurrentHashMap()); + seen = Collections.newSetFromMap(new ConcurrentHashMap<>()); } catch (NoSuchAlgorithmException e) { throw new RuntimeException(e); } diff --git a/tests/org.eclipse.n4js.spec.examples.xpect.tests/.classpath b/tests/org.eclipse.n4js.spec.examples.xpect.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.spec.examples.xpect.tests/.classpath +++ b/tests/org.eclipse.n4js.spec.examples.xpect.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.spec.examples.xpect.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.spec.examples.xpect.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.spec.examples.xpect.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.spec.examples.xpect.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.spec.examples.xpect.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.spec.examples.xpect.tests/META-INF/MANIFEST.MF index e834ada49f..316e3e9b48 100644 --- a/tests/org.eclipse.n4js.spec.examples.xpect.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.spec.examples.xpect.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.spec.examples.xpect.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.n4js.tests.helper, org.eclipse.emf.ecore.xcore, org.eclipse.n4js.ide.tests.helper, diff --git a/tests/org.eclipse.n4js.spec.tests/.classpath b/tests/org.eclipse.n4js.spec.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.spec.tests/.classpath +++ b/tests/org.eclipse.n4js.spec.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.spec.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.spec.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.spec.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.spec.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.spec.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.spec.tests/META-INF/MANIFEST.MF index 568dbf6d5c..be5aeefd82 100644 --- a/tests/org.eclipse.n4js.spec.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.spec.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.spec.tests;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional, diff --git a/tests/org.eclipse.n4js.tests.ecmatestsuite/.classpath b/tests/org.eclipse.n4js.tests.ecmatestsuite/.classpath index 2a3d9460ac..886ad6b61e 100644 --- a/tests/org.eclipse.n4js.tests.ecmatestsuite/.classpath +++ b/tests/org.eclipse.n4js.tests.ecmatestsuite/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.tests.ecmatestsuite/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.tests.ecmatestsuite/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.tests.ecmatestsuite/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.tests.ecmatestsuite/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.tests.ecmatestsuite/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.tests.ecmatestsuite/META-INF/MANIFEST.MF index 28d5f5bb8c..40e097769a 100644 --- a/tests/org.eclipse.n4js.tests.ecmatestsuite/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.tests.ecmatestsuite/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.tests.ecmatestsuite Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit, org.eclipse.emf.ecore, org.eclipse.xtext.testing, diff --git a/tests/org.eclipse.n4js.transpiler.es.tests/.classpath b/tests/org.eclipse.n4js.transpiler.es.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.transpiler.es.tests/.classpath +++ b/tests/org.eclipse.n4js.transpiler.es.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.transpiler.es.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.transpiler.es.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.transpiler.es.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.transpiler.es.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.transpiler.es.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.transpiler.es.tests/META-INF/MANIFEST.MF index 662c696c94..e39098b335 100644 --- a/tests/org.eclipse.n4js.transpiler.es.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.transpiler.es.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.transpiler.es.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: org.eclipse.n4js.transpiler.es Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext.testing, diff --git a/tests/org.eclipse.n4js.transpiler.es5.tests/.classpath b/tests/org.eclipse.n4js.transpiler.es5.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.transpiler.es5.tests/.classpath +++ b/tests/org.eclipse.n4js.transpiler.es5.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.transpiler.es5.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.transpiler.es5.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.transpiler.es5.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.transpiler.es5.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.transpiler.es5.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.transpiler.es5.tests/META-INF/MANIFEST.MF index 908f6f8cf0..34a0908204 100644 --- a/tests/org.eclipse.n4js.transpiler.es5.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.transpiler.es5.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.transpiler.es5.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext.testing, org.eclipse.emf.codegen.ecore, diff --git a/tests/org.eclipse.n4js.transpiler.tests/.classpath b/tests/org.eclipse.n4js.transpiler.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.transpiler.tests/.classpath +++ b/tests/org.eclipse.n4js.transpiler.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.transpiler.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.transpiler.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.transpiler.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.transpiler.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.transpiler.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.transpiler.tests/META-INF/MANIFEST.MF index c6298d049d..ec5adb7e93 100644 --- a/tests/org.eclipse.n4js.transpiler.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.transpiler.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.transpiler.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: org.eclipse.n4js.transpiler Require-Bundle: org.junit Automatic-Module-Name: org.eclipse.n4js.transpiler.tests diff --git a/tests/org.eclipse.n4js.ts.model.tests/.classpath b/tests/org.eclipse.n4js.ts.model.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.ts.model.tests/.classpath +++ b/tests/org.eclipse.n4js.ts.model.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.ts.model.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.ts.model.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.ts.model.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.ts.model.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.ts.model.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.ts.model.tests/META-INF/MANIFEST.MF index 52fe0b61d3..e57af34a7b 100644 --- a/tests/org.eclipse.n4js.ts.model.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.ts.model.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.ts.model.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: org.eclipse.n4js.ts.model Require-Bundle: org.eclipse.xtext.testing, org.junit, diff --git a/tests/org.eclipse.n4js.ui.tests/.classpath b/tests/org.eclipse.n4js.ui.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.ui.tests/.classpath +++ b/tests/org.eclipse.n4js.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.ui.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.ui.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.ui.tests/META-INF/MANIFEST.MF index def58a7d3f..0a63c6e928 100644 --- a/tests/org.eclipse.n4js.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.ui.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.ui.tests Bundle-Version: 0.0.1.qualifier Bundle-Vendor: %providerName -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtext.xbase.lib, org.apache.commons.logging;resolution:=optional, diff --git a/tests/org.eclipse.n4js.utils.tests/.classpath b/tests/org.eclipse.n4js.utils.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.utils.tests/.classpath +++ b/tests/org.eclipse.n4js.utils.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.utils.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.utils.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.utils.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.utils.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.utils.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.utils.tests/META-INF/MANIFEST.MF index b73615eb0e..ade228a99b 100644 --- a/tests/org.eclipse.n4js.utils.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.utils.tests/META-INF/MANIFEST.MF @@ -12,6 +12,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.n4js, org.eclipse.n4js.tests.helper, org.eclipse.n4js.xtext -Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.n4js.utils Automatic-Module-Name: org.eclipse.n4js.utils.tests diff --git a/tests/org.eclipse.n4js.xpect.tests/.classpath b/tests/org.eclipse.n4js.xpect.tests/.classpath index 3628e33687..2869279ea3 100644 --- a/tests/org.eclipse.n4js.xpect.tests/.classpath +++ b/tests/org.eclipse.n4js.xpect.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/org.eclipse.n4js.xpect.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.n4js.xpect.tests/.settings/org.eclipse.jdt.core.prefs index 65baac2f63..b492fdba84 100644 --- a/tests/org.eclipse.n4js.xpect.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.n4js.xpect.tests/.settings/org.eclipse.jdt.core.prefs @@ -26,9 +26,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable 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=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/tests/org.eclipse.n4js.xpect.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.n4js.xpect.tests/META-INF/MANIFEST.MF index 7bfbac538c..6ff504cda7 100644 --- a/tests/org.eclipse.n4js.xpect.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.n4js.xpect.tests/META-INF/MANIFEST.MF @@ -4,7 +4,6 @@ Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.n4js.xpect.tests;singleton:=true Bundle-Version: 0.0.1.qualifier Fragment-Host: org.eclipse.n4js -Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.apache.commons.logging;resolution:=optional, org.eclipse.emf.codegen.ecore;resolution:=optional,