Merge pull request #82 from AxelRICHARD/master

[releng] - Migration to Eclipse 2021-09 + v0.4.3

Author: lelandaisb

.github/workflows/build.yml

@@ -38,35 +38,35 @@ jobs:
       # Runs the maven build (build + tests)
       - name: Run maven build
         if: startsWith(github.ref, 'refs/tags/v') != true
-        run: mvn clean;mvn verify
+        run: mvn clean;mvn verify -U
 
       # Runs the maven build (build + tests + updatesite + products)
       - name: Run maven build and updatesite profiles
         if: startsWith(github.ref, 'refs/tags/v')
-        run: mvn clean -P build,updatesite;mvn -B verify -P build,updatesite
+        run: mvn clean -P build,updatesite;mvn -B -U verify -P build,updatesite
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       # Deploy maven artifacts to github
       - name: Deploy maven artifact to github (fr.cea.nabla)
         if: startsWith(github.ref, 'refs/tags/v')
-        run: mvn -B deploy:deploy-file --settings .github/workflows/settings.xml -Dfile=plugins/fr.cea.nabla/target/fr.cea.nabla-0.4.2-SNAPSHOT.jar -Dversion=0.4.2 -Durl=https://maven.pkg.github.com/cea-hpc/NabLab -DrepositoryId=github  -DgroupId=fr.cea.nabla -DartifactId=fr.cea.nabla
+        run: mvn -B deploy:deploy-file --settings .github/workflows/settings.xml -Dfile=plugins/fr.cea.nabla/target/fr.cea.nabla-0.4.3-SNAPSHOT.jar -Dversion=0.4.3 -Durl=https://maven.pkg.github.com/cea-hpc/NabLab -DrepositoryId=github  -DgroupId=fr.cea.nabla -DartifactId=fr.cea.nabla
         env:
           USERNAME: ${{ github.actor }}
           PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Deploy maven artifact to github (fr.cea.nabla.ir)
         if: startsWith(github.ref, 'refs/tags/v')
-        run: mvn -B deploy:deploy-file --settings .github/workflows/settings.xml -Dfile=plugins/fr.cea.nabla.ir/target/fr.cea.nabla.ir-0.4.2-SNAPSHOT.jar -Dversion=0.4.2 -Durl=https://maven.pkg.github.com/cea-hpc/NabLab -DrepositoryId=github  -DgroupId=fr.cea.nabla -DartifactId=fr.cea.nabla.ir
+        run: mvn -B deploy:deploy-file --settings .github/workflows/settings.xml -Dfile=plugins/fr.cea.nabla.ir/target/fr.cea.nabla.ir-0.4.3-SNAPSHOT.jar -Dversion=0.4.3 -Durl=https://maven.pkg.github.com/cea-hpc/NabLab -DrepositoryId=github  -DgroupId=fr.cea.nabla -DartifactId=fr.cea.nabla.ir
         env:
           USERNAME: ${{ github.actor }}
           PASSWORD: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Deploy maven artifact to github (fr.cea.nabla.javalib)
         if: startsWith(github.ref, 'refs/tags/v')
-        run: mvn -B deploy:deploy-file --settings .github/workflows/settings.xml -Dfile=plugins/fr.cea.nabla.javalib/target/fr.cea.nabla.javalib-0.4.2-SNAPSHOT.jar -Dversion=0.4.2 -Durl=https://maven.pkg.github.com/cea-hpc/NabLab -DrepositoryId=github  -DgroupId=fr.cea.nabla -DartifactId=fr.cea.nabla.javalib
+        run: mvn -B deploy:deploy-file --settings .github/workflows/settings.xml -Dfile=plugins/fr.cea.nabla.javalib/target/fr.cea.nabla.javalib-0.4.3-SNAPSHOT.jar -Dversion=0.4.3 -Durl=https://maven.pkg.github.com/cea-hpc/NabLab -DrepositoryId=github  -DgroupId=fr.cea.nabla -DartifactId=fr.cea.nabla.javalib
         env:
           USERNAME: ${{ github.actor }}
           PASSWORD: ${{ secrets.GITHUB_TOKEN }}

NOTICE

@@ -1,6 +1,6 @@
 # Notices for NabLab
 
-This content is produced and maintained by Commissariat � l'Energie Atomique - CEA.
+This content is produced and maintained by Commissariat � l'Energie Atomique - CEA.
 
  * Project home: https://github.com/cea-hpc/NabLab
 
@@ -24,15 +24,17 @@ The project maintains the following source code repository : https://github.com/
 
 ## Third-party Content
 
-Xtext (2.19)
+Xtext (2.25.0)
 
- * License: EPL-1.0
+ * License: EPL-2.0
  * Project: http://projects.eclipse.org/projects/modeling.tmf.xtext
+ * Source: https://github.com/eclipse/xtext
 
-Sirius (6.2.2)
+Sirius (6.5.1)
 
- * License: EPL-1.0
+ * License: EPL-2.0
  * Project: http://projects.eclipse.org/projects/modeling.sirius
+ * Source: https://git.eclipse.org/c/sirius/org.eclipse.sirius.git
 
 JGraphT (1.3.0)
 
@@ -46,4 +48,7 @@ JLatexMath (1.0.3)
  * Project: http://www.scilab.org/projects/thirdparty_project/jlatexmath
  * Source: http://forge.scilab.org/index.php/p/jlatexmath
 
-
+Commons-Math3 (3.6.1)
+  * License: Apache v2
+  * Project: https://commons.apache.org/proper/commons-math/
+  * Source: https://github.com/apache/commons-math

README.md

@@ -7,7 +7,7 @@ NabLab is a full-fledged industrial environment for scientific computing and Hig
 
 The NabLab documentation is available [here](https://cea-hpc.github.io/NabLab/).
 
-The latest NabLab environment can be downloaded [here](https://github.com/cea-hpc/NabLab/releases/tag/v0.4.2).
+The latest NabLab environment can be downloaded [here](https://github.com/cea-hpc/NabLab/releases/tag/v0.4.3).
 
 
 # Dependencies
@@ -16,16 +16,16 @@ NabLab requires Java 11 or later to build & run.
 
 It as based on:
 
-Eclipse 2021-03 for Java and DSL Developers
+Eclipse 2021-09 for Java and DSL Developers
  * License: EPL-2.0
- * Project: https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-java-and-dsl-developers
+ * Project: https://www.eclipse.org/downloads/packages/release/2021-09/r/eclipse-ide-java-and-dsl-developers
 
 Xtext (2.25.0)
  * License: EPL-2.0
  * Project: http://projects.eclipse.org/projects/modeling.tmf.xtext
  * Source: https://github.com/eclipse/xtext
 
-Sirius (6.4.2)
+Sirius (6.5.1)
  * License: EPL-2.0
  * Project: http://projects.eclipse.org/projects/modeling.sirius
  * Source: https://git.eclipse.org/c/sirius/org.eclipse.sirius.git
@@ -47,17 +47,17 @@ Commons-Math3 (3.6.1)
 
 # Installing Eclipse for NabLab contributors
 
-- Download and install [Eclipse 2021-03](https://www.eclipse.org/downloads/packages/release/2021-03/r/eclipse-ide-java-and-dsl-developers)
-- Install Zest: Help>Install New Software..., Work with http://download.eclipse.org/releases/2021-03, select Modeling>Zest SDK and install
-- 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
+- Download and install [Eclipse 2021-09](https://www.eclipse.org/downloads/packages/release/2021-09/r/eclipse-ide-java-and-dsl-developers)
+- Install Zest: Help>Install New Software..., Work with http://download.eclipse.org/releases/2021-09, select Modeling>Zest SDK and install
+- 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
 
 Then clone NabLab from GitHub and import existing projects located in plugins, tests, releng and docs directories.
 
 It is recommended to install a Markdown editor thanks to Eclipse Marketplace to contribute to the documentation.
 
 It is also recommended to install a Json editor thanks to Eclipse Marketplace to visualize/modify user data files.
 
-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.*.
+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.*.
 
 To first build NabLab from source
 - open fr.cea.nabla.ir/model/Ir.genmodel and Generate Model Code by right click on NablaIR

changeversion.sh

@@ -2,8 +2,8 @@
 #!/bin/bash
 #
 
-OLD_VERSION=0.4.1
-NEW_VERSION=0.4.2
+OLD_VERSION=0.4.2
+NEW_VERSION=0.4.3
 
 echo "Looking for MANIFEST.MF files"
 FIND_RES=`find . -path ./.metadata -prune -o -name "MANIFEST.MF" -print`

docs/fr.cea.nabla.mkdocs/Makefile

@@ -1,5 +1,5 @@
 # Variables necessary to publish nablab update site on github pages to compile Monilog4Nablab
-LAST=0.4.2
+LAST=0.4.3
 UPDATE_SITE_TAG=202107011253
 UPDATE_SITE=fr.cea.nabla.updatesite-${LAST}.${UPDATE_SITE_TAG}.zip
 # end of necessary variables

docs/fr.cea.nabla.mkdocs/docs/gettingstarted.md

@@ -11,7 +11,7 @@ Do not forget to set the `JAVA_HOME` variable to the java installation directory
 
 ### Installing NabLab
 
-The latest NabLab environment can be downloaded [here](https://github.com/cea-hpc/NabLab/releases/tag/v0.4.2) for Linux, Mac OS and Windows platforms.
+The latest NabLab environment can be downloaded [here](https://github.com/cea-hpc/NabLab/releases/tag/v0.4.3) for Linux, Mac OS and Windows platforms.
 
 Download the file corresponding to your platform, unzip it and launch the NabLab executable in the root directory.
 

features/fr.cea.nabla.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="fr.cea.nabla.feature"
       label="NabLab Environment"
-      version="0.4.2.qualifier"
+      version="0.4.3.qualifier"
       provider-name="CEA">
 
    <description>

features/fr.cea.nabla.thirdparty.libraries.feature/feature.xml

@@ -10,7 +10,7 @@
 <feature
       id="fr.cea.nabla.thirdparty.libraries.feature"
       label="Nabla 3rd party libraries feature"
-      version="0.4.2.qualifier"
+      version="0.4.3.qualifier"
       provider-name="CEA">
 
    <description>

features/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>fr.cea.nabla</groupId>
         <artifactId>parent</artifactId>
-        <version>0.4.2-SNAPSHOT</version>
+        <version>0.4.3-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 

plugins/fr.cea.nabla.edit/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: fr.cea.nabla.edit
 Bundle-ManifestVersion: 2
 Bundle-Name: fr.cea.nabla.edit
 Bundle-SymbolicName: fr.cea.nabla.edit;singleton:=true
-Bundle-Version: 0.4.2.qualifier
+Bundle-Version: 0.4.3.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: CEA
 Bundle-Localization: plugin