From a2a7242388a8ea5b8422e140f019e33309823bce Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 15:13:59 +0100 Subject: [PATCH 01/35] Updated flattened poms. --- languages/mopt/xtext/.flattened-pom.xml | 2 +- .../.flattened-pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/mopt/xtext/.flattened-pom.xml b/languages/mopt/xtext/.flattened-pom.xml index 1bfc06862..c35cc73c1 100644 --- a/languages/mopt/xtext/.flattened-pom.xml +++ b/languages/mopt/xtext/.flattened-pom.xml @@ -1,5 +1,5 @@ - 4.0.0 uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml index 595d2871d..e332b17b5 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml @@ -1,5 +1,5 @@ - 4.0.0 uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext From 9c95aa3f0cd4fc63f8e9cf45eafe815bfecc3656 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 15:34:34 +0100 Subject: [PATCH 02/35] Updated non-target Xtext dependencies --- build/maven/template/pom.xml.template | 4 ++-- examples/problems/tsp/pom.xml | 2 +- examples/problems/ttc-18/pom.xml | 2 +- interfaces/eclipse/src/pom.xml | 2 +- .../.flattened-pom.xml | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/maven/template/pom.xml.template b/build/maven/template/pom.xml.template index 5438dc594..515322b3a 100644 --- a/build/maven/template/pom.xml.template +++ b/build/maven/template/pom.xml.template @@ -31,8 +31,8 @@ ${repositories.output.root}/m2/m2.mdeoptimiser.repository ${repositories.output.root}/p2/p2.mdeoptimiser.repository ${repositories.output.root}/p2/p2.eclipse.repository - 2.17.0 - 2.17.0 + 2.38.0 + 2.38.0 11 11 UTF-8 diff --git a/examples/problems/tsp/pom.xml b/examples/problems/tsp/pom.xml index f2ea02717..62c72c0ee 100644 --- a/examples/problems/tsp/pom.xml +++ b/examples/problems/tsp/pom.xml @@ -45,7 +45,7 @@ org.eclipse.xtext org.eclipse.xtext.testing - 2.18.0 + ${xtextVersion} test diff --git a/examples/problems/ttc-18/pom.xml b/examples/problems/ttc-18/pom.xml index 490d09d4f..fabe115ac 100644 --- a/examples/problems/ttc-18/pom.xml +++ b/examples/problems/ttc-18/pom.xml @@ -8,7 +8,7 @@ 1.0.0 - 2.12.0 + 2.38.0 UTF-8 1.8 1.8 diff --git a/interfaces/eclipse/src/pom.xml b/interfaces/eclipse/src/pom.xml index 999dc3172..887336899 100644 --- a/interfaces/eclipse/src/pom.xml +++ b/interfaces/eclipse/src/pom.xml @@ -8,7 +8,7 @@ pom - 2.17.0 + 2.38.0 UTF-8 11 11 diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml index e332b17b5..7aa5cd285 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml @@ -9,38 +9,38 @@ org.eclipse.xtext org.eclipse.xtext.testing - 2.17.0 + 2.38.0 compile org.eclipse.xtext org.eclipse.xtext.xbase.testing - 2.17.0 + 2.38.0 compile org.eclipse.xtext org.eclipse.xtext - 2.17.0 + 2.38.0 compile org.eclipse.xtext org.eclipse.xtext.xbase - 2.17.0 + 2.38.0 compile org.eclipse.xtext org.eclipse.xtext.xtext.generator - 2.17.0 + 2.38.0 compile true org.eclipse.emf org.eclipse.emf.mwe2.launch - 2.10.0 + 2.21.0 compile true From 02e48c1e5fc9bf403319eb0f06b6bb4ce7ca3784 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 15:37:45 +0100 Subject: [PATCH 03/35] Initial update to target file --- ...mdeoptimiser.interfaces.eclipse.target.target.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template index c00f72a7c..15d8667a0 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template @@ -6,15 +6,15 @@ - + - + - + @@ -29,7 +29,7 @@ - + From 3c270675d1b6b763ced296389176d0ce7e204b32 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 15:57:51 +0100 Subject: [PATCH 04/35] Fix repository location for junit etc (used to be weird orbit loc) --- ....interfaces.eclipse.target.target.template | 156 +++++++++--------- 1 file changed, 81 insertions(+), 75 deletions(-) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template index 15d8667a0..1d1549d5a 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template @@ -1,76 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 565c595a9805cac3b4402a49cfb2c3eba81c7898 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 15:59:20 +0100 Subject: [PATCH 05/35] Use plugin versions based on repository latest --- ....interfaces.eclipse.target.target.template | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template index 1d1549d5a..cf99febff 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template @@ -21,18 +21,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + From b3facbbf86afb90941a8fe69fa2e178fd8746b67 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 16:03:53 +0100 Subject: [PATCH 06/35] Also request latest OCL version --- ...optimiser.interfaces.eclipse.target.target.template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template index cf99febff..f434b7a43 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template @@ -37,11 +37,11 @@ - - - - - + + + + + From b7c761abafa70962407261e4e4b90086050598b0 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 16:10:52 +0100 Subject: [PATCH 07/35] Correct names for junit plugins --- ...timiser.interfaces.eclipse.target.target.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template index f434b7a43..0b180a272 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template @@ -24,12 +24,12 @@ - - - - - - + + + + + + From 3e0af59b7ec21373f01ed20191c613ebbc219628 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 16:35:51 +0100 Subject: [PATCH 08/35] Upgrade compiler version to try and satisfy osgi.ee filters --- build/maven/template/pom.xml.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/maven/template/pom.xml.template b/build/maven/template/pom.xml.template index 515322b3a..256c2a4fe 100644 --- a/build/maven/template/pom.xml.template +++ b/build/maven/template/pom.xml.template @@ -33,8 +33,8 @@ ${repositories.output.root}/p2/p2.eclipse.repository 2.38.0 2.38.0 - 11 - 11 + 17 + 17 UTF-8 5.4.1 From 159384789adf5fd3c3dd06ee8acaf977dc8feb04 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 16:53:00 +0100 Subject: [PATCH 09/35] Update java version in eclipse interface, too --- interfaces/eclipse/src/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/eclipse/src/pom.xml b/interfaces/eclipse/src/pom.xml index 887336899..8049b9785 100644 --- a/interfaces/eclipse/src/pom.xml +++ b/interfaces/eclipse/src/pom.xml @@ -10,8 +10,8 @@ 2.38.0 UTF-8 - 11 - 11 + 17 + 17 1.4.0 From a44db8ac6b6f65702da9e6fa6f00d7de63bcc8d0 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 17:16:44 +0100 Subject: [PATCH 10/35] Some more places that were specifying compiler versions --- build/maven/template/pom.xml.template | 1 + interfaces/cli/pom.xml | 4 ++-- interfaces/eclipse/src/pom.xml | 1 + libraries/core/pom.xml | 4 ++-- libraries/rulegen/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build/maven/template/pom.xml.template b/build/maven/template/pom.xml.template index 256c2a4fe..c998c9fe7 100644 --- a/build/maven/template/pom.xml.template +++ b/build/maven/template/pom.xml.template @@ -35,6 +35,7 @@ 2.38.0 17 17 + 17 UTF-8 5.4.1 diff --git a/interfaces/cli/pom.xml b/interfaces/cli/pom.xml index 8f1c6b733..d9c4e0976 100644 --- a/interfaces/cli/pom.xml +++ b/interfaces/cli/pom.xml @@ -20,8 +20,8 @@ maven-compiler-plugin 3.0 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.source} diff --git a/interfaces/eclipse/src/pom.xml b/interfaces/eclipse/src/pom.xml index 8049b9785..dd293f3cb 100644 --- a/interfaces/eclipse/src/pom.xml +++ b/interfaces/eclipse/src/pom.xml @@ -12,6 +12,7 @@ UTF-8 17 17 + 17 1.4.0 diff --git a/libraries/core/pom.xml b/libraries/core/pom.xml index 39e84a3a0..30b9f348c 100644 --- a/libraries/core/pom.xml +++ b/libraries/core/pom.xml @@ -35,8 +35,8 @@ maven-compiler-plugin 3.0 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.source} diff --git a/libraries/rulegen/pom.xml b/libraries/rulegen/pom.xml index 0b95b5f12..dc578a929 100644 --- a/libraries/rulegen/pom.xml +++ b/libraries/rulegen/pom.xml @@ -20,8 +20,8 @@ maven-compiler-plugin 3.0 - 11 - 11 + ${maven.compiler.source} + ${maven.compiler.source} From 2806f33f81e8bec7019e680ffc6e9fa66bc7f84c Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 17:20:38 +0100 Subject: [PATCH 11/35] Try to avoid spurious error about *nix root-relative references --- .../jar-with-ecore-model.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/jar-with-ecore-model.xml b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/jar-with-ecore-model.xml index af5b4f616..5b22fa91d 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/jar-with-ecore-model.xml +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/jar-with-ecore-model.xml @@ -8,12 +8,12 @@ false - / target/classes + ./ - model/generated model/generated + model/generated From c3eee1acba98e24cdbc8127be01187230f12c0c1 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 18:45:24 +0100 Subject: [PATCH 12/35] Enable to skip tests. --- build/maven/build.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/build/maven/build.xml b/build/maven/build.xml index 3a7947f44..58c39be85 100644 --- a/build/maven/build.xml +++ b/build/maven/build.xml @@ -6,6 +6,15 @@ + + + + + + + + + @@ -15,15 +24,16 @@ + - + From ea2ea45bae37d460e166e1c95b02a1c56537123b Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 19:41:08 +0100 Subject: [PATCH 13/35] Updated Java EE in plugin projects --- .../.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 2 +- .../src/test/resources/META-INF/MANIFEST.MF | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath index 574a48682..36932d0ad 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/META-INF/MANIFEST.MF b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/META-INF/MANIFEST.MF index 15a75c897..8fab351cd 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/META-INF/MANIFEST.MF +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/META-INF/MANIFEST.MF @@ -14,5 +14,5 @@ Require-Bundle: uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui, org.eclipse.xtext.xbase.junit, org.eclipse.core.runtime, org.eclipse.ui.workbench;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: uk.ac.kcl.inf.mdeoptimiser.languages.ui.tests;x-internal=true diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath index 9891e0694..f944d606a 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/META-INF/MANIFEST.MF b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/META-INF/MANIFEST.MF index 70f574d45..73a9d9d95 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/META-INF/MANIFEST.MF +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/META-INF/MANIFEST.MF @@ -42,7 +42,7 @@ Require-Bundle: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext, org.eclipse.xtend.lib.macro, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)" Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: uk.ac.kcl.inf.mdeoptimiser.languages.ui.contentassist, uk.ac.kcl.inf.mdeoptimiser.languages.ui.quickfix, uk.ac.kcl.inf.mdeoptimiser.languages.ui.editor, diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath index f1c88db04..41e21afa3 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath @@ -26,7 +26,7 @@ - + diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF index 004b13f64..d206ffa17 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext Bundle-SymbolicName: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: uk.ac.kcl.inf.mdeoptimiser.languages, uk.ac.kcl.inf.mdeoptimiser.languages.jvmmodel, diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF index 593aef49c..63c7c78cd 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext Bundle-SymbolicName: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Export-Package: uk.ac.kcl.inf.mdeoptimiser.languages.tests;x-internal=true Require-Bundle: org.eclipse.xtext.testing, From 59c9b3d18760fec27de068c5f30ab452c2fc3f8e Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 3 Apr 2025 19:48:20 +0100 Subject: [PATCH 14/35] Updating Tycho version, hoping that this will allow Java 1.17 use... --- interfaces/eclipse/src/pom.xml | 12 +++++++----- .../pom.xml | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/interfaces/eclipse/src/pom.xml b/interfaces/eclipse/src/pom.xml index dd293f3cb..78f8bffb6 100644 --- a/interfaces/eclipse/src/pom.xml +++ b/interfaces/eclipse/src/pom.xml @@ -14,7 +14,7 @@ 17 17 - 1.4.0 + 4.0.11 @@ -61,15 +61,15 @@ - org.eclipse.tycho.extras - tycho-source-feature-plugin + org.eclipse.tycho + tycho-source-plugin ${tycho-version} - source-feature + feature-source package - source-feature + feature-source @@ -93,6 +93,7 @@ target-platform-configuration ${tycho-version} + JavaSE-17 uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse @@ -261,6 +262,7 @@ -err:-forbidden false + 1.17 uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/pom.xml b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/pom.xml index 4b5b03a7a..74fc3eb35 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/pom.xml +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/pom.xml @@ -29,7 +29,7 @@ org.eclipse.tycho target-platform-configuration - JavaSE-17 + + - + + + + + + + + + - + - + - + - + From e2c4790f15bf6ffd9bc325a6fc8903e27398a4a2 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 4 Apr 2025 11:04:54 +0100 Subject: [PATCH 17/35] Formatting cleanup --- dependencies.xml | 54 +++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/dependencies.xml b/dependencies.xml index 048ecc067..59605f658 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -1,35 +1,33 @@ - - - - - - - - - - - - - - - - + + + - - - + + + + + + + - - - - - + + + - - - - + + + + + + + + + + + + + From d6e06814e07d02e48d50f22f479b5ce149ecd3a5 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 4 Apr 2025 11:12:12 +0100 Subject: [PATCH 18/35] Fix Java version for Eclipse plugins to 21 --- interfaces/eclipse/src/pom.xml | 5 ++++- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/interfaces/eclipse/src/pom.xml b/interfaces/eclipse/src/pom.xml index 959f6c11a..0d2e160fe 100644 --- a/interfaces/eclipse/src/pom.xml +++ b/interfaces/eclipse/src/pom.xml @@ -262,7 +262,10 @@ -err:-forbidden false - 1.17 + + 1.21 + true - + From c9a2966713b06ff2930053a5a3160a34a6a23326 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 4 Apr 2025 12:21:20 +0100 Subject: [PATCH 20/35] Papyrus infra dependency added to target platform --- ....interfaces.eclipse.target.target.template | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template index 0b180a272..4ffd18b78 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template @@ -7,20 +7,6 @@ - - - - - - - - - - - - - - @@ -33,9 +19,20 @@ + + + + + + + + + + + @@ -47,7 +44,16 @@ - + + + + + + + + + From 233c832f6dab1fae43ac1110b1baa21d436dd206 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 4 Apr 2025 12:30:02 +0100 Subject: [PATCH 21/35] Add javax.annotation dependencies --- ....mdeoptimiser.interfaces.eclipse.target.target.template | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template index 4ffd18b78..2cecc7aad 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/template/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target.target.template @@ -47,6 +47,13 @@ + + + + + + From 87e1ca0df9eb6f65e012bd7bc36701043e3ff4ab Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 4 Apr 2025 12:35:22 +0100 Subject: [PATCH 22/35] Update Java version in GitHub Action --- .github/workflows/ci-cd.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 9645b5676..cbd643649 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '21' distribution: 'adopt' - name: Build with Ant uses: GabrielBB/xvfb-action@v1 @@ -33,10 +33,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 - uses: actions/setup-java@v2 + - name: Set up JDK 21 + uses: actions/setup-java@v4 with: - java-version: '11' + java-version: '21' distribution: 'adopt' - name: Build with Ant uses: GabrielBB/xvfb-action@v1 From bb2dd463da5911d584b88810267c8c1f95094f6e Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 4 Apr 2025 15:26:27 +0100 Subject: [PATCH 23/35] Make tycho use correct compiler --- interfaces/eclipse/src/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/interfaces/eclipse/src/pom.xml b/interfaces/eclipse/src/pom.xml index 0d2e160fe..98f27b557 100644 --- a/interfaces/eclipse/src/pom.xml +++ b/interfaces/eclipse/src/pom.xml @@ -262,10 +262,11 @@ -err:-forbidden false + - 1.21 - true + - + - + - + @@ -44,7 +44,7 @@ - + - + + + org.hamcrest + hamcrest + 3.0 + test From 76bdfc96f95f1c030fcaff912381cc982ec9ea35 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Mon, 2 Jun 2025 16:57:24 +0100 Subject: [PATCH 29/35] Update to 2025-03 --- Readme.md | 4 ++-- build/maven/template/pom.xml.template | 21 ++++++++++++------- .../xtend-gen/.gitkeep | 0 languages/mopt/xtext/.flattened-pom.xml | 9 +++++++- .../.flattened-pom.xml | 9 +++++++- libraries/core/pom.xml | 6 +++--- 6 files changed, 35 insertions(+), 14 deletions(-) delete mode 100644 interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/xtend-gen/.gitkeep diff --git a/Readme.md b/Readme.md index 0caf4e685..c2a8d1d6d 100644 --- a/Readme.md +++ b/Readme.md @@ -14,8 +14,8 @@ This is the main repository for [MDEOptimiser](http://mde-optimiser.github.io). Requirements: - Eclipse Version 2019-03 - Java 11 + Eclipse Version 2025-03 + Java 21 Install the version of MDEOptimiser you would like to use from one of the Eclipse Update sites below. diff --git a/build/maven/template/pom.xml.template b/build/maven/template/pom.xml.template index c998c9fe7..e93e76dfc 100644 --- a/build/maven/template/pom.xml.template +++ b/build/maven/template/pom.xml.template @@ -48,13 +48,20 @@ - - p2.eclipse.repository - https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2019-03/final/ - - - m2.moeaframework - https://mde-optimiser.github.io/mdeo_repo/repository/m2/moeaframework/ + + p2.henshin.repository + https://download.eclipse.org/modeling/emft/henshin/updates/release + + + p2.eclipse.repository + https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2025-03/final/ + + always + + + + m2.moeaframework + https://mde-optimiser.github.io/mdeo_repo/repository/m2/moeaframework/ diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/xtend-gen/.gitkeep b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/xtend-gen/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/languages/mopt/xtext/.flattened-pom.xml b/languages/mopt/xtext/.flattened-pom.xml index c35cc73c1..684f94d72 100644 --- a/languages/mopt/xtext/.flattened-pom.xml +++ b/languages/mopt/xtext/.flattened-pom.xml @@ -19,8 +19,15 @@ http://nexus.codehaus.org/snapshots/ + p2.henshin.repository + https://download.eclipse.org/modeling/emft/henshin/updates/release + + + + always + p2.eclipse.repository - https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2019-03/final/ + https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2025-03/final/ m2.moeaframework diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml index 7aa5cd285..a92b6daed 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.flattened-pom.xml @@ -65,8 +65,15 @@ http://nexus.codehaus.org/snapshots/ + p2.henshin.repository + https://download.eclipse.org/modeling/emft/henshin/updates/release + + + + always + p2.eclipse.repository - https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2019-03/final/ + https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2025-03/final/ m2.moeaframework diff --git a/libraries/core/pom.xml b/libraries/core/pom.xml index 30b9f348c..6f8f74a26 100644 --- a/libraries/core/pom.xml +++ b/libraries/core/pom.xml @@ -112,13 +112,13 @@ org.eclipse.emf org.eclipse.emf.henshin.interpreter - 1.7.0 + 1.8.0 org.eclipse.emf org.eclipse.emf.henshin.multicda.cpa - 1.7.0 + 1.8.0 org.eclipse.ocl @@ -144,7 +144,7 @@ org.eclipse.emf org.eclipse.emf.henshin.trace - 1.7.0 + 1.8.0 From 6118606b89f898a4bc1b5a9b3c452b6ad5c7e933 Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Thu, 5 Jun 2025 18:26:30 +0100 Subject: [PATCH 30/35] OCL version updates --- libraries/core/pom.xml | 6 +++--- .../guidance/ocl/OclGuidanceFunctionsFactory.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/core/pom.xml b/libraries/core/pom.xml index 6f8f74a26..6725aaa95 100644 --- a/libraries/core/pom.xml +++ b/libraries/core/pom.xml @@ -123,12 +123,12 @@ org.eclipse.ocl org.eclipse.ocl - 3.10.200 + 3.22.0 org.eclipse.ocl org.eclipse.ocl.ecore - 3.10.200 + 3.22.0 com.github.mifmif @@ -138,7 +138,7 @@ org.eclipse.emf org.eclipse.emf.ecore - 2.15.0 + 2.38.0 diff --git a/libraries/core/src/main/java/uk/ac/kcl/inf/mdeoptimiser/libraries/core/optimisation/interpreter/guidance/ocl/OclGuidanceFunctionsFactory.java b/libraries/core/src/main/java/uk/ac/kcl/inf/mdeoptimiser/libraries/core/optimisation/interpreter/guidance/ocl/OclGuidanceFunctionsFactory.java index f586fe3b2..901dc6287 100644 --- a/libraries/core/src/main/java/uk/ac/kcl/inf/mdeoptimiser/libraries/core/optimisation/interpreter/guidance/ocl/OclGuidanceFunctionsFactory.java +++ b/libraries/core/src/main/java/uk/ac/kcl/inf/mdeoptimiser/libraries/core/optimisation/interpreter/guidance/ocl/OclGuidanceFunctionsFactory.java @@ -14,7 +14,7 @@ public class OclGuidanceFunctionsFactory implements IGuidanceFunctionsFactory { static final OCL - oclInterpreter = OCL.newInstance(EcoreEnvironmentFactory.INSTANCE); + oclInterpreter = OCL.newInstanceAbstract(EcoreEnvironmentFactory.INSTANCE); static final OCLHelper oclHelper = oclInterpreter.createOCLHelper(); From 524d136750d0cfe8979248eaf7518fea5e97438d Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 6 Jun 2025 18:36:40 +0100 Subject: [PATCH 31/35] Consistent java versions --- build/maven/template/pom.xml.template | 6 +++--- interfaces/eclipse/src/pom.xml | 6 +++--- .../.classpath | 2 +- .../.classpath | 2 +- .../.classpath | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 2 +- .../src/test/resources/META-INF/MANIFEST.MF | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build/maven/template/pom.xml.template b/build/maven/template/pom.xml.template index e93e76dfc..af3323fd0 100644 --- a/build/maven/template/pom.xml.template +++ b/build/maven/template/pom.xml.template @@ -33,9 +33,9 @@ ${repositories.output.root}/p2/p2.eclipse.repository 2.38.0 2.38.0 - 17 - 17 - 17 + 21 + 21 + 21 UTF-8 5.4.1 diff --git a/interfaces/eclipse/src/pom.xml b/interfaces/eclipse/src/pom.xml index 98f27b557..92c2b6255 100644 --- a/interfaces/eclipse/src/pom.xml +++ b/interfaces/eclipse/src/pom.xml @@ -10,9 +10,9 @@ 2.38.0 UTF-8 - 17 - 17 - 17 + 21 + 21 + 21 4.0.11 diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath index 36932d0ad..254958ae3 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui.tests/.classpath @@ -1,6 +1,6 @@ - + diff --git a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath index f944d606a..0b8eb44cc 100644 --- a/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath +++ b/interfaces/eclipse/src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath index 41e21afa3..981bd5af3 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/.classpath @@ -26,7 +26,7 @@ - + diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF index d206ffa17..0151cb4e3 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/main/resources/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext Bundle-SymbolicName: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: uk.ac.kcl.inf.mdeoptimiser.languages, uk.ac.kcl.inf.mdeoptimiser.languages.jvmmodel, diff --git a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF index 63c7c78cd..1cf0caeda 100644 --- a/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF +++ b/languages/mopt/xtext/uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext/src/test/resources/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext Bundle-SymbolicName: uk.ac.kcl.inf.mdeoptimiser.languages.mopt.xtext;singleton:=true Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-ActivationPolicy: lazy Export-Package: uk.ac.kcl.inf.mdeoptimiser.languages.tests;x-internal=true Require-Bundle: org.eclipse.xtext.testing, From ceeffcebc532c3ffbb5b75e5f68a5c78feebc22d Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Fri, 6 Jun 2025 18:45:37 +0100 Subject: [PATCH 32/35] Correctly test for skip clean and skip tests --- build/maven/build.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/build/maven/build.xml b/build/maven/build.xml index d4e60559e..59bea6303 100644 --- a/build/maven/build.xml +++ b/build/maven/build.xml @@ -26,25 +26,33 @@ - + + + + + + + + + - + - + - + - + From 1445f8641b605b809bcd53050223824aedfacc4a Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Mon, 9 Jun 2025 14:32:08 +0100 Subject: [PATCH 33/35] Update compiler to 21 --- examples/problems/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/problems/pom.xml b/examples/problems/pom.xml index 862b0f0b8..93ecb3a11 100644 --- a/examples/problems/pom.xml +++ b/examples/problems/pom.xml @@ -35,8 +35,8 @@ maven-compiler-plugin 3.0 - 11 - 11 + 21 + 21 From ea514f3c9fed4306d5af7878419b9ea9908c67cf Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Mon, 9 Jun 2025 14:51:33 +0100 Subject: [PATCH 34/35] TTC example updated to Java 21 --- examples/problems/ttc-18/resource-allocation/pom.xml | 4 ++-- .../uk.ac.kcl.mdeo.ttc18.hsqos.ide/META-INF/MANIFEST.MF | 2 +- .../uk.ac.kcl.mdeo.ttc18.hsqos.tests/META-INF/MANIFEST.MF | 2 +- .../uk.ac.kcl.mdeo.ttc18.hsqos.ui.tests/META-INF/MANIFEST.MF | 2 +- .../ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui/META-INF/MANIFEST.MF | 2 +- .../ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos/META-INF/MANIFEST.MF | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/problems/ttc-18/resource-allocation/pom.xml b/examples/problems/ttc-18/resource-allocation/pom.xml index 00b94e2dd..9004cdf7c 100644 --- a/examples/problems/ttc-18/resource-allocation/pom.xml +++ b/examples/problems/ttc-18/resource-allocation/pom.xml @@ -35,8 +35,8 @@ maven-compiler-plugin 3.0 - 1.5 - 1.5 + 21 + 21 diff --git a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ide/META-INF/MANIFEST.MF b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ide/META-INF/MANIFEST.MF index d2fcddf91..d884a05a0 100644 --- a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ide/META-INF/MANIFEST.MF +++ b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ide/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Require-Bundle: uk.ac.kcl.mdeo.ttc18.hsqos, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.ide, org.antlr.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.xtext.example.mydsl.ide.contentassist.antlr.internal, org.xtext.example.mydsl.ide.contentassist.antlr diff --git a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.tests/META-INF/MANIFEST.MF b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.tests/META-INF/MANIFEST.MF index cb5190728..2f874c2b5 100644 --- a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.tests/META-INF/MANIFEST.MF +++ b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.tests/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: uk.ac.kcl.mdeo.ttc18.hsqos, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.xbase.lib, org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.xtext.example.mydsl.tests;x-internal=true Import-Package: org.hamcrest.core, org.junit;version="4.5.0", diff --git a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui.tests/META-INF/MANIFEST.MF b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui.tests/META-INF/MANIFEST.MF index 2b2643eeb..30a48143f 100644 --- a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui.tests/META-INF/MANIFEST.MF +++ b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui.tests/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Require-Bundle: uk.ac.kcl.mdeo.ttc18.hsqos.ui, org.eclipse.xtext.xbase.junit, org.eclipse.core.runtime, org.eclipse.ui.workbench;resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.hamcrest.core, org.junit;version="4.5.0", org.junit.runners.model;version="4.5.0", diff --git a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui/META-INF/MANIFEST.MF b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui/META-INF/MANIFEST.MF index f35037290..1f8a23922 100644 --- a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui/META-INF/MANIFEST.MF +++ b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Require-Bundle: uk.ac.kcl.mdeo.ttc18.hsqos, org.eclipse.xtext.xbase.ui, org.eclipse.jdt.debug.ui Import-Package: org.apache.log4j -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.xtext.example.mydsl.ui.contentassist, org.xtext.example.mydsl.ui.quickfix, uk.ac.kcl.mdeo.ttc18.hsqos.ui.internal diff --git a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos/META-INF/MANIFEST.MF b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos/META-INF/MANIFEST.MF index 1465d51b5..8e4a70da8 100644 --- a/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos/META-INF/MANIFEST.MF +++ b/examples/problems/ttc-18/uk.ac.kcl.mdeo.ttc18.hsqos/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.emf.common, org.eclipse.xtext.common.types, org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.xtext.example.mydsl.myDsl.util, org.xtext.example.mydsl.parser.antlr.internal, org.xtext.example.mydsl.scoping, From 33458c9be0e38f72c8b3f9c9b2b04d3c58e706ef Mon Sep 17 00:00:00 2001 From: Steffen Zschaler Date: Tue, 10 Jun 2025 10:29:37 +0100 Subject: [PATCH 35/35] Other examples upgraded to Java 21 --- examples/problems/argumentation/pom.xml | 4 ++-- examples/problems/cra/META-INF/MANIFEST.MF | 2 +- examples/problems/tsp/META-INF/MANIFEST.MF | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/problems/argumentation/pom.xml b/examples/problems/argumentation/pom.xml index 847ce3363..fd62cc038 100644 --- a/examples/problems/argumentation/pom.xml +++ b/examples/problems/argumentation/pom.xml @@ -49,8 +49,8 @@ maven-compiler-plugin 3.0 - 11 - 11 + 21 + 21 diff --git a/examples/problems/cra/META-INF/MANIFEST.MF b/examples/problems/cra/META-INF/MANIFEST.MF index ccf40aa81..8695a76ed 100644 --- a/examples/problems/cra/META-INF/MANIFEST.MF +++ b/examples/problems/cra/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-11 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: models.cra.fitness.architectureCRA, models.cra.fitness.architectureCRA.impl, diff --git a/examples/problems/tsp/META-INF/MANIFEST.MF b/examples/problems/tsp/META-INF/MANIFEST.MF index 14a492b2d..e3a21395b 100644 --- a/examples/problems/tsp/META-INF/MANIFEST.MF +++ b/examples/problems/tsp/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: J2SE-21 Export-Package: models.tsp.fitness.TSP, models.tsp.fitness.TSP.impl, models.tsp.fitness.TSP.util