From bec523087e5ffb7d6a70d7f73717df2b6a42bf0b Mon Sep 17 00:00:00 2001 From: Quentin Le Menez Date: Thu, 4 May 2023 15:12:21 +0200 Subject: Revert "Bug 581848 - [Releng] Revert patches to move to Java 17 as it breaks Papyrus" - Remove the latest gef-classic to point on the 2023-03 train pending patch for 2023-06 - Update pom plugin versions to the lates available This reverts commit 0d39a60b55419f8d41f47311fedff762ed028062. Change-Id: I2473af5176c49daa45d944de2fb0d2f6581c3484 Signed-off-by: Quentin Le Menez --- .../.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +++--- .../META-INF/MANIFEST.MF | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading') diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.classpath b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.classpath index e801ebfb468..81fe078c20c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.classpath +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.settings/org.eclipse.jdt.core.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.settings/org.eclipse.jdt.core.prefs index 037f04a07c2..a8cc7ef70ef 100755 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ 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=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -12,7 +12,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF index 24871dddda9..97e643a1bb6 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.resourceloading/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Bundle-Name: %pluginName Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.resourceloading.Activator Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.resourceloading;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.papyrus.views.modelexplorer.resourceloading -- cgit v1.2.3