Fix/dependencies

.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

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.

build/maven/build.xml

@@ -1,29 +1,58 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="mopt.xtext" default="default">
+<project name="mopt.xtext" 
+         default="default"
+         xmlns:if="ant:if"
+         xmlns:unless="ant:unless">
     <import file="../ant/build-common.xml"/>
 
 	<condition property="isWindows">
 		<os family="windows" />
 	</condition>
 
-    <target name="dist" depends="render.maven.properties.template, maven.build, maven.build.windows"/>
+    <!-- Set doSkipTests based on environment variable or property -->
+    <!-- So, running eg: ant -DskipTests=true OR export SKIP_TESTS=true && ant (to set an env var - can be used in github to skip for certain builds/branches) -->
+    <condition property="doSkipTests" value="true">
+        <or>
+            <isset property="env.SKIP_TESTS"/>
+            <isset property="skipTests"/>
+        </or>
+    </condition>
+
+    <!-- Enable skipping of clean to speed up dev builds -->
+    <condition property="doSkipClean" value="true">
+        <or>
+            <isset property="env.SKIP_CLEAN"/>
+            <isset property="skipClean"/>
+        </or>
+    </condition>
+
+    <target name="dist" depends="render.skipTests, render.skipClean, render.maven.properties.template, maven.build, maven.build.windows"/>
+
+    <target name="render.skipTests" if="doSkipTests">
+        <echo message="Skipping tests" />
+    </target>
+
+    <target name="render.skipClean" if="doSkipClean">
+        <echo message="Skipping cleaning" />
+    </target>
 
     <target name="maven.build.windows" if="isWindows">
         <exec dir="." executable="cmd" failifexecutionfails="true" failonerror="true">
 			<arg value="/c"/>
 			<arg value="mvn"/>
-            <arg value="clean" />
+            <arg value="clean" unless:true="${doSkipClean}" />
             <arg value="deploy" />
             <arg value="--quiet" />
+            <arg value='"-Dmaven.test.skip"' if:true="${doSkipTests}" />
         </exec>
     </target>
 
 	<target name="maven.build" unless="isWindows">
         <exec dir="." executable="mvn" failifexecutionfails="true" failonerror="true">
-            <arg value="clean" />
-            <!-- TODO: Consider putting the next into a separate target and use something like compile instead to avoid packaging everything on every commit to a PR. -->
+            <arg value="clean" unless:true="${doSkipClean}" />
             <arg value="deploy" /> 
             <arg value="--quiet" />
+            <arg value="-Dmaven.test.skip" if:true="${doSkipTests}" />
         </exec>
     </target>
 

build/maven/template/pom.xml.template

@@ -31,10 +31,11 @@
     <repositories.output.m2.mdeoptimiser>${repositories.output.root}/m2/m2.mdeoptimiser.repository</repositories.output.m2.mdeoptimiser>
     <repositories.output.p2.mdeoptimiser>${repositories.output.root}/p2/p2.mdeoptimiser.repository</repositories.output.p2.mdeoptimiser>
     <repositories.output.p2.eclipse>${repositories.output.root}/p2/p2.eclipse.repository</repositories.output.p2.eclipse>
-    <xtextVersion>2.17.0</xtextVersion>
-    <xtend.version>2.17.0</xtend.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <xtextVersion>2.38.0</xtextVersion>
+    <xtend.version>2.38.0</xtend.version>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
+    <maven.compiler.release>21</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <junit-jupiter.version>5.4.1</junit-jupiter.version>
   </properties>
@@ -47,13 +48,20 @@
       </repository>
   </distributionManagement>
   <repositories>
-      <repository>
-          <id>p2.eclipse.repository</id>
-          <url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2019-03/final/</url>
-      </repository>
-      <repository>
-		<id>m2.moeaframework</id>
-		<url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/moeaframework/</url>
+    <repository>
+        <id>p2.henshin.repository</id>
+        <url>https://download.eclipse.org/modeling/emft/henshin/updates/release</url>          
+    </repository>
+    <repository>
+        <id>p2.eclipse.repository</id>
+        <url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2025-03/final/</url>
+        <releases>
+          <updatePolicy>always</updatePolicy>
+        </releases>
+    </repository>
+    <repository>
+      <id>m2.moeaframework</id>
+      <url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/moeaframework/</url>
 	  </repository>
   </repositories>
   <!-- Load JUnit 5 Bom -->

dependencies.xml

@@ -1,35 +1,33 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="dependencies" default="depend.all">
-
-	<condition property="isWindows">
-		<os family="windows" />
-	</condition>
-
-	<target name="windows.directory.format" if="isWindows">
-		<dirname property="dependencies.basedir.windows" file="${ant.file.dependencies}"/>
-        <path id="dependencies.basedir.path">
-			<pathelement path="${dependencies.basedir.windows}" />
-		</path>
-		<pathconvert targetos="unix" property="dependencies.basedir" refid="dependencies.basedir.path"/>
-    </target>
-
-	<target name="unix.directory.format" unless="isWindows">
-	     <dirname property="dependencies.basedir" file="${ant.file.dependencies}"/>
-    </target>
+        <condition property="isWindows">
+                <os family="windows" />
+        </condition>
 
-    <!-- ================================================================== -->
-    <target name="depend.all" depends="depend.maven, depend.eclipse">
-    </target>
+        <target name="windows.directory.format" if="isWindows">
+                <dirname property="dependencies.basedir.windows" file="${ant.file.dependencies}"/>
+                <path id="dependencies.basedir.path">
+                        <pathelement path="${dependencies.basedir.windows}" />
+                </path>
+                <pathconvert targetos="unix" property="dependencies.basedir" refid="dependencies.basedir.path"/>
+        </target>
 
-    <!-- Maven Builds -->
-    <!-- ================================================================== -->
-    <target name="depend.maven" depends="windows.directory.format, unix.directory.format">
-            <ant dir="${dependencies.basedir}/build/maven" inheritAll="true"/>
-    </target>
+        <target name="unix.directory.format" unless="isWindows">
+                <dirname property="dependencies.basedir" file="${ant.file.dependencies}"/>
+        </target>
 
-    <!-- Eclipse Builds -->
-    <target name="depend.eclipse" depends="depend.maven">
-            <ant dir="${dependencies.basedir}/interfaces/eclipse" inheritAll="true"/>
-    </target>
+        <!-- ================================================================== -->
+        <target name="depend.all" depends="depend.maven, depend.eclipse">
+        </target>
 
+        <!-- Maven Builds -->
+        <!-- ================================================================== -->
+        <target name="depend.maven" depends="windows.directory.format, unix.directory.format">
+                <ant dir="${dependencies.basedir}/build/maven" inheritAll="true"/>
+        </target>
+
+        <!-- Eclipse Builds -->
+        <target name="depend.eclipse" depends="depend.maven">
+                <ant dir="${dependencies.basedir}/interfaces/eclipse" inheritAll="true"/>
+        </target>
 </project>

examples/problems/argumentation/pom.xml

@@ -49,8 +49,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>11</source>
-					<target>11</target>
+					<source>21</source>
+					<target>21</target>
 				</configuration>
 			</plugin>
 			<plugin>

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,

examples/problems/pom.xml

@@ -35,8 +35,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
             <plugin>

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

examples/problems/tsp/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.eclipse.xtext</groupId>
             <artifactId>org.eclipse.xtext.testing</artifactId>
-            <version>2.18.0</version>
+            <version>${xtextVersion}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

examples/problems/ttc-18/pom.xml

@@ -8,7 +8,7 @@
 
 	<properties>
 		<tycho-version>1.0.0</tycho-version>
-		<xtextVersion>2.12.0</xtextVersion>
+		<xtextVersion>2.38.0</xtextVersion>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>

examples/problems/ttc-18/resource-allocation/pom.xml

@@ -35,8 +35,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
+					<source>21</source>
+					<target>21</target>
 				</configuration>
 			</plugin>
 			<plugin>

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
 

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",

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",

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

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,

interfaces/cli/pom.xml

@@ -20,8 +20,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.0</version>
 				<configuration>
-					<source>11</source>
-					<target>11</target>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.source}</target>
 				</configuration>
 			</plugin>
 
@@ -67,17 +67,17 @@
 		<dependency>
 			<groupId>info.picocli</groupId>
 			<artifactId>picocli</artifactId>
-			<version>3.9.2</version>
+			<version>4.7.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
 			<artifactId>guice</artifactId>
-			<version>3.0</version>
+			<version>[6.0.0,)</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-cli</groupId>
 			<artifactId>commons-cli</artifactId>
-			<version>1.2</version>
+			<version>1.9.0</version>
 		</dependency>
 		<dependency>
 			<groupId>
@@ -100,7 +100,7 @@
 		<dependency>
 			<groupId>org.eclipse.platform</groupId>
 			<artifactId>org.eclipse.core.runtime</artifactId>
-			<version>[3.13.0,4.0.0)</version>
+			<version>[3.33.0,4.0.0)</version>
 		</dependency>
 	</dependencies>
 </project>

interfaces/eclipse/build.xml

@@ -40,7 +40,7 @@
 
     <!-- Render target file from a template to point to the local maven repository -->
 
-    <target name="render.target.template">
+    <target name="render.target.template" depends="windows.directory.format, unix.directory.format">
 
         <!-- Copy task that replaces values and copies the files -->
         <copy todir="src/uk.ac.kcl.inf.mdeoptimiser.interfaces.eclipse.target/" verbose="true" overwrite="true" failonerror="true">