Skip to content
This repository was archived by the owner on Jun 28, 2024. It is now read-only.

Commit 3a1093b

Browse files
AxelRICHARDAxelRICHARD
committed
[releng] - Migration to Eclipse 2021-09
- Eclipse 2021-09 - EMF 2.25.0 - Xtext 2.25.0 - Sirius 6.5.1 - PyDev 9.1.0 Change-Id: Id072d2ab86c785d5970c725eee76d6acf3de90b5 Signed-off-by: Axel RICHARD <[email protected]>
1 parent b9c310b commit 3a1093b

File tree

7 files changed

+63
-50
lines changed

7 files changed

+63
-50
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
# Runs the maven build (build + tests)
3939
- name: Run maven build
4040
if: startsWith(github.ref, 'refs/tags/v') != true
41-
run: mvn clean;mvn verify
41+
run: mvn clean;mvn verify -U
4242

4343
# Runs the maven build (build + tests + updatesite + products)
4444
- name: Run maven build and updatesite profiles
4545
if: startsWith(github.ref, 'refs/tags/v')
46-
run: mvn clean -P build,updatesite;mvn -B verify -P build,updatesite
46+
run: mvn clean -P build,updatesite;mvn -B -U verify -P build,updatesite
4747
env:
4848
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4949

‎NOTICE

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Notices for NabLab
22

3-
This content is produced and maintained by Commissariat � l'Energie Atomique - CEA.
3+
This content is produced and maintained by Commissariat � l'Energie Atomique - CEA.
44

55
* Project home: https://github.com/cea-hpc/NabLab
66

@@ -24,15 +24,17 @@ The project maintains the following source code repository : https://github.com/
2424

2525
## Third-party Content
2626

27-
Xtext (2.19)
27+
Xtext (2.25.0)
2828

29-
* License: EPL-1.0
29+
* License: EPL-2.0
3030
* Project: http://projects.eclipse.org/projects/modeling.tmf.xtext
31+
* Source: https://github.com/eclipse/xtext
3132

32-
Sirius (6.2.2)
33+
Sirius (6.5.1)
3334

34-
* License: EPL-1.0
35+
* License: EPL-2.0
3536
* Project: http://projects.eclipse.org/projects/modeling.sirius
37+
* Source: https://git.eclipse.org/c/sirius/org.eclipse.sirius.git
3638

3739
JGraphT (1.3.0)
3840

@@ -46,4 +48,7 @@ JLatexMath (1.0.3)
4648
* Project: http://www.scilab.org/projects/thirdparty_project/jlatexmath
4749
* Source: http://forge.scilab.org/index.php/p/jlatexmath
4850

49-
51+
Commons-Math3 (3.6.1)
52+
* License: Apache v2
53+
* Project: https://commons.apache.org/proper/commons-math/
54+
* Source: https://github.com/apache/commons-math

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ NabLab requires Java 11 or later to build & run.
1616

1717
It as based on:
1818

19-
Eclipse 2021-03 for Java and DSL Developers
19+
Eclipse 2021-09 for Java and DSL Developers
2020
* License: EPL-2.0
21-
* Project: https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-java-and-dsl-developers
21+
* Project: https://www.eclipse.org/downloads/packages/release/2021-09/r/eclipse-ide-java-and-dsl-developers
2222

2323
Xtext (2.25.0)
2424
* License: EPL-2.0
2525
* Project: http://projects.eclipse.org/projects/modeling.tmf.xtext
2626
* Source: https://github.com/eclipse/xtext
2727

28-
Sirius (6.4.2)
28+
Sirius (6.5.1)
2929
* License: EPL-2.0
3030
* Project: http://projects.eclipse.org/projects/modeling.sirius
3131
* Source: https://git.eclipse.org/c/sirius/org.eclipse.sirius.git
@@ -47,17 +47,17 @@ Commons-Math3 (3.6.1)
4747

4848
# Installing Eclipse for NabLab contributors
4949

50-
- Download and install [Eclipse 2021-03](https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-java-and-dsl-developers)
51-
- Install Zest: Help>Install New Software..., Work with http://download.eclipse.org/releases/2021-03, select Modeling>Zest SDK and install
52-
- Install Sirius via the MarketPlace: Help>Eclipse Marketplace... and Find Sirius 6.4. Do not forget to select *Sirius Integration With Xtext*. In case of message, choose proceed anyway
50+
- Download and install [Eclipse 2021-09](https://www.eclipse.org/downloads/packages/release/2021-09/r/eclipse-ide-java-and-dsl-developers)
51+
- Install Zest: Help>Install New Software..., Work with http://download.eclipse.org/releases/2021-09, select Modeling>Zest SDK and install
52+
- Install Sirius via the MarketPlace: Help>Eclipse Marketplace... and Find Sirius 6.5.1. Do not forget to select *Sirius Integration With Xtext* and *Sirius ELK Integration*. In case of message, choose proceed anyway
5353

5454
Then clone NabLab from GitHub and import existing projects located in plugins, tests, releng and docs directories.
5555

5656
It is recommended to install a Markdown editor thanks to Eclipse Marketplace to contribute to the documentation.
5757

5858
It is also recommended to install a Json editor thanks to Eclipse Marketplace to visualize/modify user data files.
5959

60-
The launch of a runtime Eclipse displays a warning of unsatisfied dependency on `javax.xml.bind`. To suppress it: Help>Install New Software..., Work with http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository and select *Java XML Streaming API* in Orbit.Bundles By Name:javax.*.
60+
The launch of a runtime Eclipse displays a warning of unsatisfied dependency on `javax.xml.bind`. To suppress it: Help>Install New Software..., Work with https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository and select *Java XML Streaming API* in Orbit.Bundles By Name:javax.*.
6161

6262
To first build NabLab from source
6363
- open fr.cea.nabla.ir/model/Ir.genmodel and Generate Model Code by right click on NablaIR

‎plugins/fr.cea.nabla/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<!-- Add a specific pom.xml to be able to generate plugins/fr.cea.nabla/src/fr/cea/nabla/GenerateNabla.mwe2 only once -->
2727
<properties>
2828
<emf-mwe2-version>2.12.1</emf-mwe2-version>
29-
<emf-codegen-version>2.21.0</emf-codegen-version>
30-
<emf-codegen-ecore-version>2.25.0</emf-codegen-ecore-version>
29+
<emf-codegen-version>2.22.0</emf-codegen-version>
30+
<emf-codegen-ecore-version>2.27.0</emf-codegen-ecore-version>
3131
<xtext-version>2.25.0</xtext-version>
3232
<xtext-antlr-version>[2.1.1, 3)</xtext-antlr-version>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
<name>NabLab build</name>
1919

2020
<properties>
21-
<tycho-version>1.5.1</tycho-version>
21+
<tycho-version>2.5.0</tycho-version>
2222
<xtend-version>2.25.0</xtend-version>
2323
<maven-clean-version>3.1.0</maven-clean-version>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25-
<maven.compiler.target>1.8</maven.compiler.target>
26-
<maven.compiler.source>1.8</maven.compiler.source>
25+
<maven.compiler.target>11</maven.compiler.target>
26+
<maven.compiler.source>11</maven.compiler.source>
2727
</properties>
2828

2929
<distributionManagement>

‎releng/fr.cea.nabla.targetplatform/nablab.target

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde?>
33
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
4-
<target name="NabLab Target platform" sequenceNumber="1620132970">
4+
<target name="NabLab Target platform" sequenceNumber="1634544901">
55
<locations>
66
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
7-
<unit id="org.eclipse.sdk.feature.group" version="4.19.0.v20210303-1800"/>
8-
<unit id="org.eclipse.rcp.feature.group" version="4.19.0.v20210303-1800"/>
9-
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.11.1100.v20210227-0235"/>
10-
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1100.v20210209-1541"/>
11-
<unit id="org.eclipse.emf.feature.group" version="2.25.0.v20210114-1734"/>
7+
<unit id="org.eclipse.sdk.feature.group" version="4.21.0.v20210906-0842"/>
8+
<unit id="org.eclipse.rcp.feature.group" version="4.21.0.v20210906-0842"/>
9+
<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.11.1300.v20210830-0925"/>
10+
<unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1300.v20210828-0802"/>
11+
<unit id="org.eclipse.emf.feature.group" version="2.27.0.v20210816-1137"/>
1212
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.12.1.v20210218-2134"/>
1313
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="2.12.1.v20210218-2134"/>
1414
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.12.1.v20210218-2134"/>
@@ -19,43 +19,47 @@
1919
<unit id="org.eclipse.xtext.xbase.junit" version="2.25.0.v20210301-0928"/>
2020
<unit id="org.eclipse.xtext.xbase.testing" version="2.25.0.v20210301-0909"/>
2121
<unit id="org.eclipse.xtext.junit4" version="2.25.0.v20210301-0928"/>
22-
<unit id="org.eclipse.cdt.feature.group" version="10.2.0.202103011047"/>
23-
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.21.0.v202102251419"/>
24-
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.21.0.v202102222242"/>
25-
<unit id="org.eclipse.egit.feature.group" version="5.11.0.202103091610-r"/>
22+
<unit id="org.eclipse.cdt.feature.group" version="10.4.0.202109080104"/>
23+
<unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.23.0.v202107272335"/>
24+
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.23.0.v202107101937"/>
25+
<unit id="org.eclipse.egit.feature.group" version="5.13.0.202109080827-r"/>
2626
<unit id="org.eclipse.zest.core" version="1.5.300.201606061308"/>
2727
<unit id="org.eclipse.zest.layouts" version="1.1.300.201606061308"/>
2828
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
2929
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
3030
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
31-
<unit id="com.google.gson" version="2.8.6.v20201231-1626"/>
32-
<repository id="eclipse" location="https://download.eclipse.org/releases/2021-03"/>
31+
<unit id="com.google.gson" version="2.8.7.v20210624-1215"/>
32+
<repository id="eclipse" location="https://download.eclipse.org/releases/2021-09"/>
3333
</location>
3434
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
35-
<unit id="org.eclipse.sirius.aql.feature.group" version="6.4.2.202103091337"/>
36-
<unit id="org.eclipse.sirius.runtime.feature.group" version="6.4.2.202103091337"/>
37-
<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="6.4.2.202103091337"/>
38-
<unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="6.4.2.202103091337"/>
39-
<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="6.4.2.202103091337"/>
40-
<unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="6.4.2.202103091337"/>
41-
<unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="6.4.2.202103091337"/>
42-
<unit id="org.eclipse.sirius.properties.feature.feature.group" version="6.4.2.202103091337"/>
35+
<unit id="org.eclipse.sirius.aql.feature.group" version="6.5.1.202106111115"/>
36+
<unit id="org.eclipse.sirius.runtime.feature.group" version="6.5.1.202106111115"/>
37+
<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="6.5.1.202106111115"/>
38+
<unit id="org.eclipse.sirius.runtime.ocl.feature.group" version="6.5.1.202106111115"/>
39+
<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="6.5.1.202106111115"/>
40+
<unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="6.5.1.202106111115"/>
41+
<unit id="org.eclipse.sirius.runtime.ide.xtext.feature.group" version="6.5.1.202106111115"/>
42+
<unit id="org.eclipse.sirius.properties.feature.feature.group" version="6.5.1.202106111115"/>
4343
<unit id="org.eclipse.eef.sdk.feature.feature.group" version="2.1.5.202008270808"/>
4444
<unit id="org.eclipse.eef.ext.widgets.reference.feature.feature.group" version="2.1.5.202008270808"/>
45-
<unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="6.4.2.202103091337"/>
46-
<repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/6.4.2/2020-06"/>
45+
<unit id="org.eclipse.sirius.diagram.elk.feature.feature.group" version="6.5.1.202106111115"/>
46+
<repository id="sirius" location="https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09"/>
4747
</location>
4848
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
4949
<unit id="org.eclipse.gmf.runtime.notation.feature.group" version="1.13.0.202004160913"/>
5050
<repository id="gmf-runtime-notation" location="http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/"/>
5151
</location>
5252
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
53-
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/>
53+
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.0.202107090702"/>
5454
<repository id="gmf-runtime-diagram" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/"/>
5555
</location>
5656
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
57-
<unit id="org.python.pydev.feature.feature.group" version="7.4.0.201910251334"/>
58-
<repository id="python" location="http://www.pydev.org/update_sites/7.4.0"/>
57+
<unit id="org.apache.batik.script" version="1.14.0.v20210324-0332"/>
58+
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository"/>
59+
</location>
60+
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
61+
<unit id="org.python.pydev.feature.feature.group" version="9.1.0.202110031145"/>
62+
<repository id="python" location="http://www.pydev.org/update_sites/9.1.0"/>
5963
</location>
6064
<location includeMode="planner" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
6165
<unit id="jsonedit-feature.feature.group" version="1.1.3"/>

‎releng/fr.cea.nabla.targetplatform/nablab.tpd

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ target "NabLab Target platform"
1212
with requirements
1313
environment JavaSE-11
1414

15-
location eclipse "https://download.eclipse.org/releases/2021-03" {
15+
location eclipse "https://download.eclipse.org/releases/2021-09" {
1616
org.eclipse.sdk.feature.group
1717
org.eclipse.rcp.feature.group
1818
org.eclipse.equinox.p2.sdk.feature.group
@@ -40,7 +40,7 @@ location eclipse "https://download.eclipse.org/releases/2021-03" {
4040
com.google.gson
4141
}
4242

43-
location sirius "https://download.eclipse.org/sirius/updates/releases/6.4.2/2020-06" {
43+
location sirius "https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09" {
4444
org.eclipse.sirius.aql.feature.group
4545
org.eclipse.sirius.runtime.feature.group
4646
org.eclipse.sirius.runtime.aql.feature.group
@@ -55,14 +55,18 @@ location sirius "https://download.eclipse.org/sirius/updates/releases/6.4.2/2020
5555
}
5656

5757
location gmf-runtime-notation "http://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/" {
58-
org.eclipse.gmf.runtime.notation.feature.group [1.10.0,2.0.0)
58+
org.eclipse.gmf.runtime.notation.feature.group [1.13.0,2.0.0)
5959
}
6060

6161
location gmf-runtime-diagram "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/" {
62-
org.eclipse.gmf.runtime.sdk.feature.group [1.10.1,2.0.0)
62+
org.eclipse.gmf.runtime.sdk.feature.group [1.14.0,2.0.0)
6363
}
6464

65-
location python "http://www.pydev.org/update_sites/7.4.0" {
65+
location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" {
66+
org.apache.batik.script [1.14.0,2.0.0)
67+
}
68+
69+
location python "http://www.pydev.org/update_sites/9.1.0" {
6670
org.python.pydev.feature.feature.group
6771
}
6872

0 commit comments

Comments
 (0)