Skip to content

Commit 05b5f56

Browse files
szschalerszschaler
authored
Merge pull request #125 from mde-optimiser/fix/dependencies
Fix/dependencies
2 parents 7df9a56 + 33458c9 commit 05b5f56

File tree

37 files changed

+278
-197
lines changed

37 files changed

+278
-197
lines changed

‎.github/workflows/ci-cd.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313

1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Set up JDK 11
17-
uses: actions/setup-java@v2
16+
- name: Set up JDK 21
17+
uses: actions/setup-java@v4
1818
with:
19-
java-version: '11'
19+
java-version: '21'
2020
distribution: 'adopt'
2121
- name: Build with Ant
2222
uses: GabrielBB/xvfb-action@v1
@@ -33,10 +33,10 @@ jobs:
3333

3434
steps:
3535
- uses: actions/checkout@v2
36-
- name: Set up JDK 11
37-
uses: actions/setup-java@v2
36+
- name: Set up JDK 21
37+
uses: actions/setup-java@v4
3838
with:
39-
java-version: '11'
39+
java-version: '21'
4040
distribution: 'adopt'
4141
- name: Build with Ant
4242
uses: GabrielBB/xvfb-action@v1

‎Readme.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ This is the main repository for [MDEOptimiser](http://mde-optimiser.github.io).
1414

1515
Requirements:
1616

17-
Eclipse Version 2019-03
18-
Java 11
17+
Eclipse Version 2025-03
18+
Java 21
1919

2020
Install the version of MDEOptimiser you would like to
2121
use from one of the Eclipse Update sites below.

‎build/maven/build.xml‎

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,58 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
2-
<project name="mopt.xtext" default="default">
2+
<project name="mopt.xtext"
3+
default="default"
4+
xmlns:if="ant:if"
5+
xmlns:unless="ant:unless">
36
<import file="../ant/build-common.xml"/>
47

58
<condition property="isWindows">
69
<os family="windows" />
710
</condition>
811

9-
<target name="dist" depends="render.maven.properties.template, maven.build, maven.build.windows"/>
12+
<!-- Set doSkipTests based on environment variable or property -->
13+
<!-- 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) -->
14+
<condition property="doSkipTests" value="true">
15+
<or>
16+
<isset property="env.SKIP_TESTS"/>
17+
<isset property="skipTests"/>
18+
</or>
19+
</condition>
20+
21+
<!-- Enable skipping of clean to speed up dev builds -->
22+
<condition property="doSkipClean" value="true">
23+
<or>
24+
<isset property="env.SKIP_CLEAN"/>
25+
<isset property="skipClean"/>
26+
</or>
27+
</condition>
28+
29+
<target name="dist" depends="render.skipTests, render.skipClean, render.maven.properties.template, maven.build, maven.build.windows"/>
30+
31+
<target name="render.skipTests" if="doSkipTests">
32+
<echo message="Skipping tests" />
33+
</target>
34+
35+
<target name="render.skipClean" if="doSkipClean">
36+
<echo message="Skipping cleaning" />
37+
</target>
1038

1139
<target name="maven.build.windows" if="isWindows">
1240
<exec dir="." executable="cmd" failifexecutionfails="true" failonerror="true">
1341
<arg value="/c"/>
1442
<arg value="mvn"/>
15-
<arg value="clean" />
43+
<arg value="clean" unless:true="${doSkipClean}" />
1644
<arg value="deploy" />
1745
<arg value="--quiet" />
46+
<arg value='"-Dmaven.test.skip"' if:true="${doSkipTests}" />
1847
</exec>
1948
</target>
2049

2150
<target name="maven.build" unless="isWindows">
2251
<exec dir="." executable="mvn" failifexecutionfails="true" failonerror="true">
23-
<arg value="clean" />
24-
<!-- 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. -->
52+
<arg value="clean" unless:true="${doSkipClean}" />
2553
<arg value="deploy" />
2654
<arg value="--quiet" />
55+
<arg value="-Dmaven.test.skip" if:true="${doSkipTests}" />
2756
</exec>
2857
</target>
2958

‎build/maven/template/pom.xml.template‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,11 @@
3131
<repositories.output.m2.mdeoptimiser>${repositories.output.root}/m2/m2.mdeoptimiser.repository</repositories.output.m2.mdeoptimiser>
3232
<repositories.output.p2.mdeoptimiser>${repositories.output.root}/p2/p2.mdeoptimiser.repository</repositories.output.p2.mdeoptimiser>
3333
<repositories.output.p2.eclipse>${repositories.output.root}/p2/p2.eclipse.repository</repositories.output.p2.eclipse>
34-
<xtextVersion>2.17.0</xtextVersion>
35-
<xtend.version>2.17.0</xtend.version>
36-
<maven.compiler.source>11</maven.compiler.source>
37-
<maven.compiler.target>11</maven.compiler.target>
34+
<xtextVersion>2.38.0</xtextVersion>
35+
<xtend.version>2.38.0</xtend.version>
36+
<maven.compiler.source>21</maven.compiler.source>
37+
<maven.compiler.target>21</maven.compiler.target>
38+
<maven.compiler.release>21</maven.compiler.release>
3839
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3940
<junit-jupiter.version>5.4.1</junit-jupiter.version>
4041
</properties>
@@ -47,13 +48,20 @@
4748
</repository>
4849
</distributionManagement>
4950
<repositories>
50-
<repository>
51-
<id>p2.eclipse.repository</id>
52-
<url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2019-03/final/</url>
53-
</repository>
54-
<repository>
55-
<id>m2.moeaframework</id>
56-
<url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/moeaframework/</url>
51+
<repository>
52+
<id>p2.henshin.repository</id>
53+
<url>https://download.eclipse.org/modeling/emft/henshin/updates/release</url>
54+
</repository>
55+
<repository>
56+
<id>p2.eclipse.repository</id>
57+
<url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/eclipse/2025-03/final/</url>
58+
<releases>
59+
<updatePolicy>always</updatePolicy>
60+
</releases>
61+
</repository>
62+
<repository>
63+
<id>m2.moeaframework</id>
64+
<url>https://mde-optimiser.github.io/mdeo_repo/repository/m2/moeaframework/</url>
5765
</repository>
5866
</repositories>
5967
<!-- Load JUnit 5 Bom -->

‎dependencies.xml‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
22
<project name="dependencies" default="depend.all">
3-
4-
<condition property="isWindows">
5-
<os family="windows" />
6-
</condition>
7-
8-
<target name="windows.directory.format" if="isWindows">
9-
<dirname property="dependencies.basedir.windows" file="${ant.file.dependencies}"/>
10-
<path id="dependencies.basedir.path">
11-
<pathelement path="${dependencies.basedir.windows}" />
12-
</path>
13-
<pathconvert targetos="unix" property="dependencies.basedir" refid="dependencies.basedir.path"/>
14-
</target>
15-
16-
<target name="unix.directory.format" unless="isWindows">
17-
<dirname property="dependencies.basedir" file="${ant.file.dependencies}"/>
18-
</target>
3+
<condition property="isWindows">
4+
<os family="windows" />
5+
</condition>
196

20-
<!-- ================================================================== -->
21-
<target name="depend.all" depends="depend.maven, depend.eclipse">
22-
</target>
7+
<target name="windows.directory.format" if="isWindows">
8+
<dirname property="dependencies.basedir.windows" file="${ant.file.dependencies}"/>
9+
<path id="dependencies.basedir.path">
10+
<pathelement path="${dependencies.basedir.windows}" />
11+
</path>
12+
<pathconvert targetos="unix" property="dependencies.basedir" refid="dependencies.basedir.path"/>
13+
</target>
2314

24-
<!-- Maven Builds -->
25-
<!-- ================================================================== -->
26-
<target name="depend.maven" depends="windows.directory.format, unix.directory.format">
27-
<ant dir="${dependencies.basedir}/build/maven" inheritAll="true"/>
28-
</target>
15+
<target name="unix.directory.format" unless="isWindows">
16+
<dirname property="dependencies.basedir" file="${ant.file.dependencies}"/>
17+
</target>
2918

30-
<!-- Eclipse Builds -->
31-
<target name="depend.eclipse" depends="depend.maven">
32-
<ant dir="${dependencies.basedir}/interfaces/eclipse" inheritAll="true"/>
33-
</target>
19+
<!-- ================================================================== -->
20+
<target name="depend.all" depends="depend.maven, depend.eclipse">
21+
</target>
3422

23+
<!-- Maven Builds -->
24+
<!-- ================================================================== -->
25+
<target name="depend.maven" depends="windows.directory.format, unix.directory.format">
26+
<ant dir="${dependencies.basedir}/build/maven" inheritAll="true"/>
27+
</target>
28+
29+
<!-- Eclipse Builds -->
30+
<target name="depend.eclipse" depends="depend.maven">
31+
<ant dir="${dependencies.basedir}/interfaces/eclipse" inheritAll="true"/>
32+
</target>
3533
</project>

‎examples/problems/argumentation/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<artifactId>maven-compiler-plugin</artifactId>
5050
<version>3.0</version>
5151
<configuration>
52-
<source>11</source>
53-
<target>11</target>
52+
<source>21</source>
53+
<target>21</target>
5454
</configuration>
5555
</plugin>
5656
<plugin>

‎examples/problems/cra/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier
77
Bundle-ClassPath: .
88
Bundle-Vendor: %providerName
99
Bundle-Localization: plugin
10-
Bundle-RequiredExecutionEnvironment: JavaSE-11
10+
Bundle-RequiredExecutionEnvironment: JavaSE-21
1111
Export-Package:
1212
models.cra.fitness.architectureCRA,
1313
models.cra.fitness.architectureCRA.impl,

‎examples/problems/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<artifactId>maven-compiler-plugin</artifactId>
3636
<version>3.0</version>
3737
<configuration>
38-
<source>11</source>
39-
<target>11</target>
38+
<source>21</source>
39+
<target>21</target>
4040
</configuration>
4141
</plugin>
4242
<plugin>

‎examples/problems/tsp/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier
77
Bundle-ClassPath: .
88
Bundle-Vendor: %providerName
99
Bundle-Localization: plugin
10-
Bundle-RequiredExecutionEnvironment: J2SE-1.5
10+
Bundle-RequiredExecutionEnvironment: J2SE-21
1111
Export-Package: models.tsp.fitness.TSP,
1212
models.tsp.fitness.TSP.impl,
1313
models.tsp.fitness.TSP.util

‎examples/problems/tsp/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>org.eclipse.xtext</groupId>
4747
<artifactId>org.eclipse.xtext.testing</artifactId>
48-
<version>2.18.0</version>
48+
<version>${xtextVersion}</version>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>

0 commit comments

Comments
 (0)