From c4d81d61bf2990c63794eafefda709463cdf7c9b Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Thu, 13 Jun 2024 15:23:38 +0200 Subject: [PATCH 1/3] Updates Java to 21 --- org.emoflon.core.dependencies/.classpath | 2 +- org.emoflon.core.dependencies/META-INF/MANIFEST.MF | 2 +- org.emoflon.smartemf/.classpath | 2 +- org.emoflon.smartemf/META-INF/MANIFEST.MF | 2 +- org.moflon.core.branding/.classpath | 2 +- org.moflon.core.branding/META-INF/MANIFEST.MF | 2 +- org.moflon.core.build/.classpath | 2 +- org.moflon.core.build/META-INF/MANIFEST.MF | 2 +- .../src/org/moflon/core/build/MoflonProjectCreator.java | 2 +- org.moflon.core.plugins/.classpath | 2 +- org.moflon.core.plugins/META-INF/MANIFEST.MF | 2 +- .../moflon/core/plugins/PluginProducerWorkspaceRunnable.java | 2 +- .../org/moflon/core/plugins/manifest/ManifestFileUpdater.java | 2 +- org.moflon.core.preferences/.classpath | 2 +- org.moflon.core.preferences/META-INF/MANIFEST.MF | 2 +- org.moflon.core.propertycontainer/.classpath | 2 +- org.moflon.core.propertycontainer/META-INF/MANIFEST.MF | 2 +- org.moflon.core.ui.autosetup/.classpath | 2 +- org.moflon.core.ui.autosetup/META-INF/MANIFEST.MF | 2 +- org.moflon.core.ui.packageregistration/.classpath | 2 +- org.moflon.core.ui.packageregistration/META-INF/MANIFEST.MF | 2 +- org.moflon.core.ui/.classpath | 2 +- org.moflon.core.ui/META-INF/MANIFEST.MF | 2 +- org.moflon.core.utilities/.classpath | 2 +- org.moflon.core.utilities/META-INF/MANIFEST.MF | 2 +- org.moflon.core.xtext/.classpath | 2 +- org.moflon.core.xtext/META-INF/MANIFEST.MF | 2 +- org.moflon.emf.build/.classpath | 2 +- org.moflon.emf.build/META-INF/MANIFEST.MF | 2 +- org.moflon.emf.codegen/.classpath | 2 +- org.moflon.emf.codegen/META-INF/MANIFEST.MF | 2 +- org.moflon.emf.ui/.classpath | 2 +- org.moflon.emf.ui/META-INF/MANIFEST.MF | 2 +- org.moflon.git.ui/.classpath | 2 +- org.moflon.git.ui/META-INF/MANIFEST.MF | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/org.emoflon.core.dependencies/.classpath b/org.emoflon.core.dependencies/.classpath index 5b0e1d0c..c53f2a0e 100644 --- a/org.emoflon.core.dependencies/.classpath +++ b/org.emoflon.core.dependencies/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.emoflon.core.dependencies/META-INF/MANIFEST.MF b/org.emoflon.core.dependencies/META-INF/MANIFEST.MF index 75504521..537e7912 100644 --- a/org.emoflon.core.dependencies/META-INF/MANIFEST.MF +++ b/org.emoflon.core.dependencies/META-INF/MANIFEST.MF @@ -77,7 +77,7 @@ Export-Package: org.apache.commons.lang3, org.gervarro.plan.dynprog, org.gervarro.util, org.gervarro.util.index -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: org.emoflon.core.dependencies Require-Bundle: com.google.guava;visibility:=reexport, org.apache.ant;bundle-version="1.10.5";visibility:=reexport, diff --git a/org.emoflon.smartemf/.classpath b/org.emoflon.smartemf/.classpath index 5cf859b2..96ae102f 100644 --- a/org.emoflon.smartemf/.classpath +++ b/org.emoflon.smartemf/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.emoflon.smartemf/META-INF/MANIFEST.MF b/org.emoflon.smartemf/META-INF/MANIFEST.MF index 0b0e224b..6ad4c435 100644 --- a/org.emoflon.smartemf/META-INF/MANIFEST.MF +++ b/org.emoflon.smartemf/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: SmartEMF Bundle-SymbolicName: org.emoflon.smartemf Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: smartemf -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0", org.emoflon.smartemf.dependencies;bundle-version="1.0.0";visibility:=reexport, org.eclipse.emf.ecore;bundle-version="2.23.0";visibility:=reexport, diff --git a/org.moflon.core.branding/.classpath b/org.moflon.core.branding/.classpath index a7a673fa..d45a34e0 100644 --- a/org.moflon.core.branding/.classpath +++ b/org.moflon.core.branding/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.branding/META-INF/MANIFEST.MF b/org.moflon.core.branding/META-INF/MANIFEST.MF index caef040e..9c4b1063 100644 --- a/org.moflon.core.branding/META-INF/MANIFEST.MF +++ b/org.moflon.core.branding/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: eMoflon::Core branding resources (icons,...) Bundle-SymbolicName: org.moflon.core.branding Bundle-Version: 1.0.0.qualifier Bundle-Vendor: eMoflon developers -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: org.moflon.core.branding diff --git a/org.moflon.core.build/.classpath b/org.moflon.core.build/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.core.build/.classpath +++ b/org.moflon.core.build/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.build/META-INF/MANIFEST.MF b/org.moflon.core.build/META-INF/MANIFEST.MF index 5c40e642..7a83029e 100644 --- a/org.moflon.core.build/META-INF/MANIFEST.MF +++ b/org.moflon.core.build/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core build components for Eclipse Bundle-SymbolicName: org.moflon.core.build Bundle-Version: 1.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: eMoflon developers Require-Bundle: org.emoflon.core.dependencies;bundle-version="1.0.0", org.moflon.core.utilities;bundle-version="2.0.0", diff --git a/org.moflon.core.build/src/org/moflon/core/build/MoflonProjectCreator.java b/org.moflon.core.build/src/org/moflon/core/build/MoflonProjectCreator.java index 0eafdbe4..33a51306 100644 --- a/org.moflon.core.build/src/org/moflon/core/build/MoflonProjectCreator.java +++ b/org.moflon.core.build/src/org/moflon/core/build/MoflonProjectCreator.java @@ -182,7 +182,7 @@ private void createManifestFile() throws CoreException { changed |= ManifestFileUpdater.updateAttribute(manifest, PluginManifestConstants.BUNDLE_ACTIVATION_POLICY, "lazy", AttributeUpdatePolicy.KEEP); changed |= ManifestFileUpdater.updateAttribute(manifest, - PluginManifestConstants.BUNDLE_EXECUTION_ENVIRONMENT, "JavaSE-17", AttributeUpdatePolicy.FORCE); + PluginManifestConstants.BUNDLE_EXECUTION_ENVIRONMENT, "JavaSE-21", AttributeUpdatePolicy.FORCE); changed |= ManifestFileUpdater.updateAttribute(manifest, PluginManifestConstants.AUTOMATIC_MODULE_NAME, pluginId, AttributeUpdatePolicy.KEEP); return changed; diff --git a/org.moflon.core.plugins/.classpath b/org.moflon.core.plugins/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.core.plugins/.classpath +++ b/org.moflon.core.plugins/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.plugins/META-INF/MANIFEST.MF b/org.moflon.core.plugins/META-INF/MANIFEST.MF index 134b7296..bcd0371f 100644 --- a/org.moflon.core.plugins/META-INF/MANIFEST.MF +++ b/org.moflon.core.plugins/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-SymbolicName: org.moflon.core.plugins;singleton:=true Bundle-Name: eMoflon::Core components for reading, creating, and updating Eclipse plugin projects Bundle-Version: 3.1.0.qualifier Bundle-Vendor: eMoflon developers -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.moflon.core.plugins, org.moflon.core.plugins.manifest Require-Bundle: org.moflon.core.utilities, diff --git a/org.moflon.core.plugins/src/org/moflon/core/plugins/PluginProducerWorkspaceRunnable.java b/org.moflon.core.plugins/src/org/moflon/core/plugins/PluginProducerWorkspaceRunnable.java index d134fcac..f2104c0f 100644 --- a/org.moflon.core.plugins/src/org/moflon/core/plugins/PluginProducerWorkspaceRunnable.java +++ b/org.moflon.core.plugins/src/org/moflon/core/plugins/PluginProducerWorkspaceRunnable.java @@ -101,7 +101,7 @@ protected void configureManifest(final IProgressMonitor monitor) throws CoreExce changed |= ManifestFileUpdater.updateAttribute(manifest, PluginManifestConstants.BUNDLE_ACTIVATION_POLICY, "lazy", AttributeUpdatePolicy.KEEP); changed |= ManifestFileUpdater.updateAttribute(manifest, - PluginManifestConstants.BUNDLE_EXECUTION_ENVIRONMENT, "JavaSE-17", AttributeUpdatePolicy.FORCE); + PluginManifestConstants.BUNDLE_EXECUTION_ENVIRONMENT, "JavaSE-21", AttributeUpdatePolicy.FORCE); changed |= ManifestFileUpdater.updateDependencies(manifest, Arrays .asList(new String[] { WorkspaceHelper.PLUGIN_ID_ECORE, WorkspaceHelper.PLUGIN_ID_ECORE_XMI })); diff --git a/org.moflon.core.plugins/src/org/moflon/core/plugins/manifest/ManifestFileUpdater.java b/org.moflon.core.plugins/src/org/moflon/core/plugins/manifest/ManifestFileUpdater.java index 581909c0..270133e2 100644 --- a/org.moflon.core.plugins/src/org/moflon/core/plugins/manifest/ManifestFileUpdater.java +++ b/org.moflon.core.plugins/src/org/moflon/core/plugins/manifest/ManifestFileUpdater.java @@ -409,7 +409,7 @@ public static boolean setBasicProperties(final Manifest manifest, final String p changed |= ManifestFileUpdater.updateAttribute(manifest, PluginManifestConstants.BUNDLE_ACTIVATION_POLICY, "lazy", AttributeUpdatePolicy.KEEP); changed |= ManifestFileUpdater.updateAttribute(manifest, PluginManifestConstants.BUNDLE_EXECUTION_ENVIRONMENT, - "JavaSE-17", AttributeUpdatePolicy.FORCE); + "JavaSE-21", AttributeUpdatePolicy.FORCE); return changed; } diff --git a/org.moflon.core.preferences/.classpath b/org.moflon.core.preferences/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.core.preferences/.classpath +++ b/org.moflon.core.preferences/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.preferences/META-INF/MANIFEST.MF b/org.moflon.core.preferences/META-INF/MANIFEST.MF index f9acb823..7c59b9f1 100644 --- a/org.moflon.core.preferences/META-INF/MANIFEST.MF +++ b/org.moflon.core.preferences/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core eMoflon preferences infrastructure Bundle-SymbolicName: org.moflon.core.preferences;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: eMoflon developers Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)" diff --git a/org.moflon.core.propertycontainer/.classpath b/org.moflon.core.propertycontainer/.classpath index bc828937..89cbda4c 100644 --- a/org.moflon.core.propertycontainer/.classpath +++ b/org.moflon.core.propertycontainer/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.propertycontainer/META-INF/MANIFEST.MF b/org.moflon.core.propertycontainer/META-INF/MANIFEST.MF index 6d1c4971..ef30eaeb 100644 --- a/org.moflon.core.propertycontainer/META-INF/MANIFEST.MF +++ b/org.moflon.core.propertycontainer/META-INF/MANIFEST.MF @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.emf.codegen, org.eclipse.emf.codegen.ecore Bundle-ManifestVersion: 2 -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/org.moflon.core.ui.autosetup/.classpath b/org.moflon.core.ui.autosetup/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.core.ui.autosetup/.classpath +++ b/org.moflon.core.ui.autosetup/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.ui.autosetup/META-INF/MANIFEST.MF b/org.moflon.core.ui.autosetup/META-INF/MANIFEST.MF index face844d..325495f8 100644 --- a/org.moflon.core.ui.autosetup/META-INF/MANIFEST.MF +++ b/org.moflon.core.ui.autosetup/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core Workspace auto-setup components Bundle-SymbolicName: org.moflon.core.ui.autosetup;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.equinox.registry;bundle-version="[3.0.0,4.0.0)", org.eclipse.team.ui;bundle-version="[3.0.0,4.0.0)", org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)", diff --git a/org.moflon.core.ui.packageregistration/.classpath b/org.moflon.core.ui.packageregistration/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.core.ui.packageregistration/.classpath +++ b/org.moflon.core.ui.packageregistration/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.ui.packageregistration/META-INF/MANIFEST.MF b/org.moflon.core.ui.packageregistration/META-INF/MANIFEST.MF index 3f29db65..652b4604 100644 --- a/org.moflon.core.ui.packageregistration/META-INF/MANIFEST.MF +++ b/org.moflon.core.ui.packageregistration/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core components for registering Ecore files Bundle-SymbolicName: org.moflon.core.ui.packageregistration;singleton:=true Bundle-Version: 1.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.11.0", org.eclipse.core.resources, org.eclipse.equinox.registry, diff --git a/org.moflon.core.ui/.classpath b/org.moflon.core.ui/.classpath index 18b0a761..503e3f03 100644 --- a/org.moflon.core.ui/.classpath +++ b/org.moflon.core.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.ui/META-INF/MANIFEST.MF b/org.moflon.core.ui/META-INF/MANIFEST.MF index 8d82ae0a..a0a81ded 100644 --- a/org.moflon.core.ui/META-INF/MANIFEST.MF +++ b/org.moflon.core.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core UI components Bundle-SymbolicName: org.moflon.core.ui;singleton:=true Bundle-Version: 1.3.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: net.sourceforge.plantuml.eclipse;bundle-version="1.1.19", org.eclipse.ui.workbench;bundle-version="3.0.0", org.eclipse.ui.console;bundle-version="3.0.0", diff --git a/org.moflon.core.utilities/.classpath b/org.moflon.core.utilities/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.core.utilities/.classpath +++ b/org.moflon.core.utilities/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.utilities/META-INF/MANIFEST.MF b/org.moflon.core.utilities/META-INF/MANIFEST.MF index a98b08be..c1927284 100644 --- a/org.moflon.core.utilities/META-INF/MANIFEST.MF +++ b/org.moflon.core.utilities/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: eMoflon developers Export-Package: org.moflon.core.utilities, org.moflon.core.utilities.xtext Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.apache.log4j;bundle-version="[1.2,2)";visibility:=reexport, org.eclipse.jdt.ui, org.eclipse.ui, diff --git a/org.moflon.core.xtext/.classpath b/org.moflon.core.xtext/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.core.xtext/.classpath +++ b/org.moflon.core.xtext/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.xtext/META-INF/MANIFEST.MF b/org.moflon.core.xtext/META-INF/MANIFEST.MF index 8a1d74e9..c983d3ea 100644 --- a/org.moflon.core.xtext/META-INF/MANIFEST.MF +++ b/org.moflon.core.xtext/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core components for working with Xtext Bundle-SymbolicName: org.moflon.core.xtext;singleton:=true Bundle-Version: 2.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.xtext.ui, org.moflon.core.utilities;bundle-version="3.0.0" Export-Package: org.moflon.core.xtext.exceptions, diff --git a/org.moflon.emf.build/.classpath b/org.moflon.emf.build/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.emf.build/.classpath +++ b/org.moflon.emf.build/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.emf.build/META-INF/MANIFEST.MF b/org.moflon.emf.build/META-INF/MANIFEST.MF index f6543345..90d0b6c6 100644 --- a/org.moflon.emf.build/META-INF/MANIFEST.MF +++ b/org.moflon.emf.build/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: eMoflon::Core EMF build infrastructure Bundle-SymbolicName: org.moflon.emf.build;singleton:=true Bundle-Version: 1.2.0.qualifier Bundle-Vendor: eMoflon developers -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.0.0", org.eclipse.core.resources;bundle-version="3.0.0";visibility:=reexport, org.emoflon.smartemf;bundle-version="1.0.0", diff --git a/org.moflon.emf.codegen/.classpath b/org.moflon.emf.codegen/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.emf.codegen/.classpath +++ b/org.moflon.emf.codegen/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.emf.codegen/META-INF/MANIFEST.MF b/org.moflon.emf.codegen/META-INF/MANIFEST.MF index a9ed1bc5..71528412 100644 --- a/org.moflon.emf.codegen/META-INF/MANIFEST.MF +++ b/org.moflon.emf.codegen/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: eMoflon::Core EMF code generator Bundle-SymbolicName: org.moflon.emf.codegen;singleton:=true Bundle-Version: 2.0.0.qualifier Bundle-Vendor: eMoflon developers -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.moflon.emf.codegen, org.moflon.emf.codegen.resource, org.moflon.emf.codegen.template diff --git a/org.moflon.emf.ui/.classpath b/org.moflon.emf.ui/.classpath index 5bfb3c39..2605d96c 100644 --- a/org.moflon.emf.ui/.classpath +++ b/org.moflon.emf.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.emf.ui/META-INF/MANIFEST.MF b/org.moflon.emf.ui/META-INF/MANIFEST.MF index 0800bd3e..12938034 100644 --- a/org.moflon.emf.ui/META-INF/MANIFEST.MF +++ b/org.moflon.emf.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core UI components for EMF code generation Bundle-SymbolicName: org.moflon.emf.ui;singleton:=true Bundle-Version: 1.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.0.0", org.eclipse.jface;bundle-version="3.0.0", org.eclipse.xtext.xbase.lib, diff --git a/org.moflon.git.ui/.classpath b/org.moflon.git.ui/.classpath index 81fe078c..375961e4 100644 --- a/org.moflon.git.ui/.classpath +++ b/org.moflon.git.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.git.ui/META-INF/MANIFEST.MF b/org.moflon.git.ui/META-INF/MANIFEST.MF index 827d6e8b..1d5b8d25 100644 --- a/org.moflon.git.ui/META-INF/MANIFEST.MF +++ b/org.moflon.git.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: eMoflon::Core Git tooling Bundle-SymbolicName: org.moflon.git.ui;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: org.eclipse.equinox.registry;bundle-version="3.6.100", org.eclipse.ui.workbench;bundle-version="3.0.0", org.eclipse.jface;bundle-version="3.0.0", From eadc8007083cdbd77b0d72bb29d0f45a0a12e57b Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Thu, 13 Jun 2024 15:59:59 +0200 Subject: [PATCH 2/3] Downgrade the SmartEMF project to Java v17 SmartEMF must currently be locked to Java 17 because of a type incompatibility --- org.emoflon.smartemf/.classpath | 2 +- org.emoflon.smartemf/META-INF/MANIFEST.MF | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.emoflon.smartemf/.classpath b/org.emoflon.smartemf/.classpath index 96ae102f..5cf859b2 100644 --- a/org.emoflon.smartemf/.classpath +++ b/org.emoflon.smartemf/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.emoflon.smartemf/META-INF/MANIFEST.MF b/org.emoflon.smartemf/META-INF/MANIFEST.MF index 6ad4c435..0b0e224b 100644 --- a/org.emoflon.smartemf/META-INF/MANIFEST.MF +++ b/org.emoflon.smartemf/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: SmartEMF Bundle-SymbolicName: org.emoflon.smartemf Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: smartemf -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0", org.emoflon.smartemf.dependencies;bundle-version="1.0.0";visibility:=reexport, org.eclipse.emf.ecore;bundle-version="2.23.0";visibility:=reexport, From ce0af47b04660e18e94ae4885d0c9f935ae57f0d Mon Sep 17 00:00:00 2001 From: Maximilian Kratz Date: Thu, 13 Jun 2024 16:30:30 +0200 Subject: [PATCH 3/3] Downgrades two core projects to JDK 17 because of SmartEMF --- org.emoflon.core.dependencies/.classpath | 2 +- org.emoflon.core.dependencies/META-INF/MANIFEST.MF | 2 +- org.moflon.core.utilities/.classpath | 2 +- org.moflon.core.utilities/META-INF/MANIFEST.MF | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.emoflon.core.dependencies/.classpath b/org.emoflon.core.dependencies/.classpath index c53f2a0e..5b0e1d0c 100644 --- a/org.emoflon.core.dependencies/.classpath +++ b/org.emoflon.core.dependencies/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.emoflon.core.dependencies/META-INF/MANIFEST.MF b/org.emoflon.core.dependencies/META-INF/MANIFEST.MF index 537e7912..75504521 100644 --- a/org.emoflon.core.dependencies/META-INF/MANIFEST.MF +++ b/org.emoflon.core.dependencies/META-INF/MANIFEST.MF @@ -77,7 +77,7 @@ Export-Package: org.apache.commons.lang3, org.gervarro.plan.dynprog, org.gervarro.util, org.gervarro.util.index -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.emoflon.core.dependencies Require-Bundle: com.google.guava;visibility:=reexport, org.apache.ant;bundle-version="1.10.5";visibility:=reexport, diff --git a/org.moflon.core.utilities/.classpath b/org.moflon.core.utilities/.classpath index 375961e4..81fe078c 100644 --- a/org.moflon.core.utilities/.classpath +++ b/org.moflon.core.utilities/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.moflon.core.utilities/META-INF/MANIFEST.MF b/org.moflon.core.utilities/META-INF/MANIFEST.MF index c1927284..a98b08be 100644 --- a/org.moflon.core.utilities/META-INF/MANIFEST.MF +++ b/org.moflon.core.utilities/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: eMoflon developers Export-Package: org.moflon.core.utilities, org.moflon.core.utilities.xtext Bundle-ClassPath: . -Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.apache.log4j;bundle-version="[1.2,2)";visibility:=reexport, org.eclipse.jdt.ui, org.eclipse.ui,