Skip to content

ST6RI-827 Update metamodel for 2025-02/Beta 3 baseline#629

Merged
seidewitz merged 9 commits intomasterfrom
ST6RI-827
Mar 7, 2025
Merged

ST6RI-827 Update metamodel for 2025-02/Beta 3 baseline#629
seidewitz merged 9 commits intomasterfrom
ST6RI-827

Conversation

@seidewitz
Copy link
Member

@seidewitz seidewitz commented Mar 3, 2025

This PR updates the EMF metamodel implementation for the combined changes to the KerML and SysML abstract syntax models from KerML FTF2 Ballots #5 and #6 and SysML v2 FTF2 Ballots #7 and #8. This is the baseline abstract syntax for the Beta 3 delivery of the FTFs to OMG. All .uml and .ecore files in the org.omg.sysml/model directory have been consistently updated with this baseline.

The current PR includes the minimum set of changes to adapters, delegates and library models to allow the implementation to build and all existing tests to pass without changes. It does not include the complete implementation of most substantive resolutions on the latest FTF ballots. The remaining resolution implementations will be completed in subsequent PRs in the near future.

Metaclasses Removed

KerML

Featuring
ItemFeature
ItemFlowEnd
ItemFlow
SuccessionItemFlow

SysML

FlowConnectionDefinition
FlowConnectionUsage
LifeClass
SuccessionFlowConnectionUsage

Metaclasses Added

KerML

ConstructorExpression
FlowEnd
Flow
InstantiationExpression
PayloadFeature
SuccessionFlow

SysML

FlowDefinition
FlowUsage
SuccessionFlowUsage

Metaclasses Updated

KerML

Updates to specialization and/or attributes (including derived)
Connector
Feature
FeatureMembership
MetadataAccessExpression
InvocationExpression
Succession
TriggerInvocationExpression
TypeFeaturing

Updates to only constraints and/or operations
Element
Expression
FeatureChainExpression
FeatureReferenceExpression
FeatureValue
Function
Membership
MultiplicityRange
Namespace
OperatorExpression
OwningMembership
ParameterMembership
Redefinition
Subsetting
TransitionUsage
Type

SysML

Updates to specialization and/or attributes (including derived)
Definition
OccurrenceDefinition
Usage

Updates to only constraints and/or operations
AssertConstraintUsage
AssignmentActionUsage
ControlNode
ItemUsage
OccurrenceUsage
PerformActionUsage
Relationship
SatisfyRequirementUsage

- Also generated sysml_clean.ecore file for SysML+KerML abstract
syntax using standard UML2 Ecore generation.

- Updated metamodel URI to 20250201.

- Updated KerML and SysML grammars *only* for breaking changes in
abstract syntax models.

- Did *not* regenerate implementation classes or parsers.
- Updated adapters and some delegates.
- Generated parsers.
(These will need to be regenerated again after later updates for other
issue resolutions.)

- Regenerated model library index.
- Updated KerML and SysML Xpect libraries.
@seidewitz seidewitz self-assigned this Mar 3, 2025
@seidewitz seidewitz added this to the 2025-02 milestone Mar 3, 2025
@seidewitz
Copy link
Member Author

@ivan-gomes @manasbajaj
The metamodel files on this branch are now ready for use in generating JSON schema and OSLC shape/vocab files. I would like to make sure these can be generated without any problems before creating the normative abstract syntax XMI files.

@ujhelyiz ujhelyiz self-requested a review March 5, 2025 16:11
Copy link
Member

@ivan-gomes ivan-gomes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ST6RI-833 Update JSON Schema for the 2025-02 baseline
Copy link
Contributor

@ujhelyiz ujhelyiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the late review, looks reasonable to me.

@seidewitz seidewitz merged commit 75b62cd into master Mar 7, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants