diff --git a/doc/1-Kernel_Modeling_Language.pdf b/doc/1-Kernel_Modeling_Language.pdf index 474dcbf..473cbc8 100644 Binary files a/doc/1-Kernel_Modeling_Language.pdf and b/doc/1-Kernel_Modeling_Language.pdf differ diff --git a/doc/2a-OMG_Systems_Modeling_Language.pdf b/doc/2a-OMG_Systems_Modeling_Language.pdf index f8e511a..97e8827 100644 Binary files a/doc/2a-OMG_Systems_Modeling_Language.pdf and b/doc/2a-OMG_Systems_Modeling_Language.pdf differ diff --git a/doc/2b-SysML_v1_to_v2_Transformation.pdf b/doc/2b-SysML_v1_to_v2_Transformation.pdf index 409cb51..8a85561 100644 Binary files a/doc/2b-SysML_v1_to_v2_Transformation.pdf and b/doc/2b-SysML_v1_to_v2_Transformation.pdf differ diff --git a/doc/3-Systems_Modeling_API_and_Services.pdf b/doc/3-Systems_Modeling_API_and_Services.pdf index 66ad214..a9f528a 100644 Binary files a/doc/3-Systems_Modeling_API_and_Services.pdf and b/doc/3-Systems_Modeling_API_and_Services.pdf differ diff --git a/doc/Intro to the SysML v2 Language-Textual Notation.pdf b/doc/Intro to the SysML v2 Language-Textual Notation.pdf index aff588c..42cafd6 100644 Binary files a/doc/Intro to the SysML v2 Language-Textual Notation.pdf and b/doc/Intro to the SysML v2 Language-Textual Notation.pdf differ diff --git a/install/eclipse/README.adoc b/install/eclipse/README.adoc index 5b6c2bc..072859d 100644 --- a/install/eclipse/README.adoc +++ b/install/eclipse/README.adoc @@ -1,14 +1,14 @@ = SysML v2 Release Eclipse Installation -*Requirements:* Eclipse 2022-09 (4.25), with Java Development Kit +*Requirements:* Eclipse 2024-03 (4.31), with Java Development Kit -(*Note:* The release may work on later versions of Eclipse, but it has only been tested on 2022-09.) +(*Note:* The release may work on later versions of Eclipse, but it has only been tested on 2024-03.) == Installing the plugins . Open an Eclipse workspace. . Select `Help > Install New Software`. -. Select `+Add...+` and then, in the add dialog, select `+Archive...+` . +. Select `Add...` and then, in the add dialog, select `Archive...` . . Navigate to the `org.omg.sysml.site.zip` archive and select it. (You can give it a name if you wish.) Click `Add`. . In the Install window, select the `KerML and SysML Editors` category and click `Next`. . Continue with the installation (select `Install Anyway` if asked), and, when it is complete, restart Eclipse. @@ -32,8 +32,9 @@ below, delete the `kerml`, `sysml` and `sysml.library` projects from your worksp . Select `File > Import`. . Under `General`, choose `Existing Projects into Workspace`. . Browse to the `sysml.library` directory and select it. -. Under `Projects`, select `sysml.library`, under `Options` select `Copy projects into workspace`, then click `Finish`. -. Turn off `Project > Build Automatically`, then select `+Project > Clean...+` and build _only_ `sysml.library`. +. Under `Projects`, select `sysml.library`, under `Options` select `Copy projects into workspace`, then click `Finish`. + (If Eclipse asks whether to "overwrite settings", select `No`.) +. Turn off `Project > Build Automatically`, then select `Project > Clean...` and build _only_ `sysml.library`. . Repeat the above steps for the `kerml` and `sysml` projects. *Important Note:* Import the `kerml` and `sysml` projects _only_ after importing and building the `sysml.library` project. @@ -47,7 +48,7 @@ and make sure that `sysml.library` is before `kerml` and `sysml` in the build or . Create new KerML files in the `kerml/src` directory with the extension `.kerml`. . Create new SysML files in the `sysml/src` directory with the extension `.sysml`. . You can view the model library files in the `sysml.library` project, but _do not change them_. -. To show SysML diagrams, in `+Window > Show View > Other...+` select the PlantUML view. The diagram rendered in the view is relative to the text selected +. To show SysML diagrams, in `Window > Show View > Other...` select the PlantUML view. The diagram rendered in the view is relative to the text selected in the active SysML editor view. Tree (BDD-like), interconnection (IBD-like) and state machine views are currently supported. *Release Note:* While performance has improved further in this release, there are still cases in which the processing of a file with diff --git a/install/eclipse/README.pdf b/install/eclipse/README.pdf index 214d8ad..ad41e2a 100644 Binary files a/install/eclipse/README.pdf and b/install/eclipse/README.pdf differ diff --git a/install/eclipse/org.omg.sysml.site.zip b/install/eclipse/org.omg.sysml.site.zip index 3e813ea..e309af8 100644 Binary files a/install/eclipse/org.omg.sysml.site.zip and b/install/eclipse/org.omg.sysml.site.zip differ diff --git a/install/jupyter/README.pdf b/install/jupyter/README.pdf index 63e7072..7fda6e4 100644 Binary files a/install/jupyter/README.pdf and b/install/jupyter/README.pdf differ diff --git a/install/jupyter/install.bat b/install/jupyter/install.bat index 1d3eed0..d83542b 100755 --- a/install/jupyter/install.bat +++ b/install/jupyter/install.bat @@ -21,7 +21,7 @@ @echo off -set SYSML_VERSION="0.40.0" +set SYSML_VERSION="0.41.1" echo --- Step 1: Testing Conda installation --- where conda @@ -41,7 +41,7 @@ call java -version || goto :error echo --- Step 3: Installing Jupyter SysML kernel and dependencies --- call jupyter kernelspec remove sysml -f >nul 2>&1 -call conda install "jupyter-sysml-kernel=%SYSML_VERSION%" python=3.* jupyterlab=2.* graphviz=2.* nodejs=14.* -c conda-forge -y || goto:error +call conda install "jupyter-sysml-kernel=%SYSML_VERSION%" python=3.* jupyterlab=3.* graphviz=2.* nodejs="<17" -c conda-forge -y || goto:error echo --- Step 4: Installing JupyterLab SysML extension --- call jupyter labextension uninstall @systems-modeling/jupyterlab-sysml diff --git a/install/jupyter/install.sh b/install/jupyter/install.sh index 336d6a4..e383b3f 100755 --- a/install/jupyter/install.sh +++ b/install/jupyter/install.sh @@ -22,7 +22,7 @@ set -e -SYSML_VERSION="0.40.0" +SYSML_VERSION="0.41.1" echo "--- Step 1: Testing Conda installation ---" command -v conda || (echo "Conda is not installed. Please install Conda and re-run." && return 1) @@ -34,7 +34,7 @@ java -version echo "--- Step 3: Installing Jupyter SysML kernel and dependencies ---" jupyter kernelspec remove sysml -f > /dev/null 2>&1 || true -conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=2.* graphviz=2.* nodejs=15.* -c conda-forge -y +conda install "jupyter-sysml-kernel=$SYSML_VERSION" python=3.* jupyterlab=3.* graphviz=2.* nodejs="<17" -c conda-forge -y echo "--- Step 4: Installing JupyterLab SysML extension ---" jupyter labextension uninstall @systems-modeling/jupyterlab-sysml > /dev/null 2>&1 || true