diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 45d33d0..b164806 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: - name: Install sysand run: | - curl -fsSL https://client.sysand.com/install.sh | sh -s -- --version latest + curl -fsSL https://sysand.com/install.sh | SYSAND_VERSION=latest sh - name: Check version in git tag matches the project's declared version run: | @@ -51,25 +51,7 @@ jobs: - name: Install sysand run: | - curl -fsSL https://client.sysand.com/install.sh | sh -s -- --version latest - - - name: Acquire and configure sysand index credentials - run: | - GITHUB_OIDC_TOKEN=$( - curl -s -H "Authorization: bearer $ACTIONS_ID_TOKEN_REQUEST_TOKEN" \ - "$ACTIONS_ID_TOKEN_REQUEST_URL&audience=sysand" \ - | grep -o '"value": *"[^"]*"' \ - | cut -d'"' -f4 \ - ) - SYSAND_INDEX_TOKEN=$( - curl -s -X POST "${SYSAND_INDEX_URL}/api/v1/oidc/token" \ - -H "Content-Type: application/json" \ - -d "{\"token\": \"${GITHUB_OIDC_TOKEN}\"}" \ - | grep -o '"token": *"[^"]*"' \ - | cut -d'"' -f4 \ - ) - echo "SYSAND_CRED_X=${SYSAND_INDEX_URL}/api/v1/**" >> "$GITHUB_ENV" - echo "SYSAND_CRED_X_BEARER_TOKEN=$SYSAND_INDEX_TOKEN" >> "$GITHUB_ENV" + curl -fsSL https://sysand.com/install.sh | SYSAND_VERSION=latest sh - name: Build and publish the project to the index run: | diff --git a/simulation_analysis/.project.json b/simulation_analysis/.project.json index df9ea23..a333a75 100644 --- a/simulation_analysis/.project.json +++ b/simulation_analysis/.project.json @@ -1,12 +1,12 @@ { "name": "Simulation and Analysis", + "publisher": "ode4hera", "description": "Library for modeling simulation and analysis concepts, in particular related to Model-Based Design (MBD) and Multidisciplinary Design Analysis and Optimization (MDAO).", - "version": "2.0.1", + "version": "2.0.2", "license": "MIT", "maintainer": [ "German Aerospace Center (DLR) " ], - "publisher": "ode4hera", "website": "https://www.ode4hera.eu/", "topic": [ "MBD", @@ -15,10 +15,6 @@ "Multidisciplinary Design Analysis and Optimization" ], "usage": [ - { - "resource": "pkg:sysand/ode4hera/requirements-management", - "versionConstraint": "^2.0.0" - }, { "resource": "pkg:sysand/ode4hera/architecture-design", "versionConstraint": "^2.0.0" @@ -34,6 +30,10 @@ }, { "resource": "https://www.omg.org/spec/SysML/20250201/Systems-Library.kpar" + }, + { + "resource": "pkg:sysand/ode4hera/requirements-management", + "versionConstraint": "^2.0.1" } ] } diff --git a/simulation_analysis/CHANGELOG.md b/simulation_analysis/CHANGELOG.md index 5b25b98..ac35b0f 100644 --- a/simulation_analysis/CHANGELOG.md +++ b/simulation_analysis/CHANGELOG.md @@ -1,6 +1,10 @@ # Simulation and Analysis Changelog -## 2026-05-29: v2.0 +## 2026-07-14: v2.0.2 + +- Support changes in requirements management library (changed SYSMOD dependency) + +## 2026-05-29: v2.0.1 - Reworked the MDAO problem definition structure to be more SysML v2-native - Reused design variable and metric attribute definitions from the Architecture Design library diff --git a/simulation_analysis/MultiDisciplinaryAnalysisOptimization.sysml b/simulation_analysis/MultiDisciplinaryAnalysisOptimization.sysml index 1f7be5d..d9378e4 100644 --- a/simulation_analysis/MultiDisciplinaryAnalysisOptimization.sysml +++ b/simulation_analysis/MultiDisciplinaryAnalysisOptimization.sysml @@ -54,7 +54,7 @@ library package MultidisciplinaryDesignAnalysisOptimization { private import ScalarValues::*; private import Collections::*; - private import SYSMOD::*; + private import RequirementsManagement::*; private import ModelBasedDesign::*; private import ArchitectureDesign::*; public import MDAOSemanticMetadata::*; diff --git a/simulation_analysis/examples/mdao/TMS/01_TMS_stakeholder_needs.sysml b/simulation_analysis/examples/mdao/TMS/01_TMS_stakeholder_needs.sysml index 019067b..0b0c37a 100644 --- a/simulation_analysis/examples/mdao/TMS/01_TMS_stakeholder_needs.sysml +++ b/simulation_analysis/examples/mdao/TMS/01_TMS_stakeholder_needs.sysml @@ -19,9 +19,9 @@ package TMS_Stakeholders { part airline: Stakeholder { doc /* Specific airline company */ - attribute priority :>> risk = SYSMOD::PriorityKind::high; + attribute :>> risk = SYSMOD::LevelKind::high; contact :>> contact= "point.of.contact@airline.com"; - :>> categories = StakeholderCategoryKind::User; + :>> categories = StakeholderCategoryKind::user; } part aircraft_oem: Stakeholder { doc /* Specific aircraft manufacturer */ diff --git a/simulation_analysis/sysand-lock.toml b/simulation_analysis/sysand-lock.toml index 1b01719..3c7b9ea 100644 --- a/simulation_analysis/sysand-lock.toml +++ b/simulation_analysis/sysand-lock.toml @@ -3,6 +3,7 @@ lock_version = "0.5" [[project]] +publisher = "ode4hera" name = "Architecture Design" version = "2.0.0" exports = [ @@ -100,13 +101,12 @@ usages = [ ] [[project]] +publisher = "ode4hera" name = "Requirements Management" -version = "2.0.0" +version = "2.0.1" exports = [ "RequirementsManagement", "RequirementsManagement_AttributesExample", - "SYSMOD", - "SYSMOD_Process", ] identifiers = [ "pkg:sysand/ode4hera/requirements-management", @@ -116,14 +116,16 @@ usages = [ "https://www.omg.org/spec/KerML/20250201/Function-Library.kpar", "https://www.omg.org/spec/KerML/20250201/Semantic-Library.kpar", "https://www.omg.org/spec/SysML/20250201/Systems-Library.kpar", + "pkg:sysand/mbse4u/sysmod", ] sources = [ - { index_kpar = "https://sysand.com/index/ode4hera/requirements-management/2.0.0/project.kpar", kpar_size = 11017, kpar_digest = "7703ee330e3787cc73907e863ef9b3d508bac6f2a8e956b72cd85cf23d5af6f0" }, + { index_kpar = "https://sysand.com/index/ode4hera/requirements-management/2.0.1/project.kpar", kpar_size = 8798, kpar_digest = "bf4fa99b780a02c6498afd6912b18f70bb4321e04a306ecf474570a8cfdc2d68" }, ] [[project]] +publisher = "ode4hera" name = "Simulation and Analysis" -version = "2.0.0" +version = "2.0.2" exports = [ "ArchitectureFileExample", "FlightControlSystemExample", @@ -196,3 +198,17 @@ usages = [ "https://www.omg.org/spec/KerML/20250201/Function-Library.kpar", "https://www.omg.org/spec/KerML/20250201/Semantic-Library.kpar", ] + +[[project]] +publisher = "mbse4u" +name = "sysmod" +version = "5.1.0" +exports = [ + "SYSMOD", +] +identifiers = [ + "pkg:sysand/mbse4u/sysmod", +] +sources = [ + { index_kpar = "https://sysand.com/index/mbse4u/sysmod/5.1.0/project.kpar", kpar_size = 17039, kpar_digest = "2245124597e8c182d6e0060c714e9c0c942f8cde8e1ec60e5341fd2dc7c60cf4" }, +]