Merge branch 'release/2023-02-rc1'

Systems-Modeling · Mar 10, 2023 · 2487e7c · 2487e7c
2 parents f6c0548 + 96fd0aa
commit 2487e7c
Show file tree

Hide file tree

Showing 59 changed files with 728,972 additions and 728,972 deletions.
diff --git a/app/org/omg/sysml/metamodel/Definition.java b/app/org/omg/sysml/metamodel/Definition.java
@@ -27,67 +27,67 @@
 import java.util.Set;
 
 public interface Definition extends Classifier, SysMLType {
-    List<? extends Usage> getOwnedUsage();
+    Boolean getIsVariation();
 
-    List<? extends PortUsage> getOwnedPort();
+    Collection<? extends Usage> getVariant();
 
-    List<? extends Usage> getDirectedUsage();
+    Collection<? extends VariantMembership> getVariantMembership();
 
     List<? extends Usage> getUsage();
 
-    List<? extends StateUsage> getOwnedState();
-
-    List<? extends ConstraintUsage> getOwnedConstraint();
-
-    Collection<? extends TransitionUsage> getOwnedTransition();
-
-    List<? extends RequirementUsage> getOwnedRequirement();
+    List<? extends Usage> getDirectedUsage();
 
-    List<? extends CalculationUsage> getOwnedCalculation();
+    List<? extends Usage> getOwnedUsage();
 
-    Boolean getIsVariation();
+    List<? extends ReferenceUsage> getOwnedReference();
 
-    Collection<? extends VariantMembership> getVariantMembership();
+    List<? extends AttributeUsage> getOwnedAttribute();
 
-    List<? extends AnalysisCaseUsage> getOwnedAnalysisCase();
+    List<? extends EnumerationUsage> getOwnedEnumeration();
 
-    Collection<? extends Usage> getVariant();
+    List<? extends OccurrenceUsage> getOwnedOccurrence();
 
-    List<? extends CaseUsage> getOwnedCase();
+    List<? extends ItemUsage> getOwnedItem();
 
-    List<? extends ReferenceUsage> getOwnedReference();
+    List<? extends PartUsage> getOwnedPart();
 
-    List<? extends ActionUsage> getOwnedAction();
+    List<? extends PortUsage> getOwnedPort();
 
     List<? extends ConnectorAsUsage> getOwnedConnection();
 
-    List<? extends ItemUsage> getOwnedItem();
-
-    List<? extends PartUsage> getOwnedPart();
+    Collection<? extends FlowConnectionUsage> getOwnedFlow();
 
     List<? extends InterfaceUsage> getOwnedInterface();
 
-    List<? extends AttributeUsage> getOwnedAttribute();
+    List<? extends AllocationUsage> getOwnedAllocation();
 
-    List<? extends ViewUsage> getOwnedView();
+    List<? extends ActionUsage> getOwnedAction();
 
-    List<? extends ViewpointUsage> getOwnedViewpoint();
+    List<? extends StateUsage> getOwnedState();
 
-    List<? extends RenderingUsage> getOwnedRendering();
+    Collection<? extends TransitionUsage> getOwnedTransition();
 
-    List<? extends VerificationCaseUsage> getOwnedVerificationCase();
+    List<? extends CalculationUsage> getOwnedCalculation();
 
-    List<? extends EnumerationUsage> getOwnedEnumeration();
+    List<? extends ConstraintUsage> getOwnedConstraint();
 
-    List<? extends AllocationUsage> getOwnedAllocation();
+    List<? extends RequirementUsage> getOwnedRequirement();
 
     Collection<? extends ConcernUsage> getOwnedConcern();
 
-    List<? extends OccurrenceUsage> getOwnedOccurrence();
+    List<? extends CaseUsage> getOwnedCase();
+
+    List<? extends AnalysisCaseUsage> getOwnedAnalysisCase();
+
+    List<? extends VerificationCaseUsage> getOwnedVerificationCase();
 
     List<? extends UseCaseUsage> getOwnedUseCase();
 
-    Collection<? extends FlowConnectionUsage> getOwnedFlow();
+    List<? extends ViewUsage> getOwnedView();
+
+    List<? extends ViewpointUsage> getOwnedViewpoint();
+
+    List<? extends RenderingUsage> getOwnedRendering();
 
     List<? extends MetadataUsage> getOwnedMetadata();
 }
diff --git a/app/org/omg/sysml/metamodel/RequirementDefinition.java b/app/org/omg/sysml/metamodel/RequirementDefinition.java
@@ -31,15 +31,15 @@ public interface RequirementDefinition extends ConstraintDefinition, SysMLType {
 
     Collection<? extends String> getText();
 
-    List<? extends ConstraintUsage> getAssumedConstraint();
-
-    List<? extends ConstraintUsage> getRequiredConstraint();
-
     Usage getSubjectParameter();
 
-    List<? extends ConcernUsage> getFramedConcern();
-
     List<? extends PartUsage> getActorParameter();
 
     List<? extends PartUsage> getStakeholderParameter();
+
+    List<? extends ConstraintUsage> getAssumedConstraint();
+
+    List<? extends ConstraintUsage> getRequiredConstraint();
+
+    List<? extends ConcernUsage> getFramedConcern();
 }
diff --git a/app/org/omg/sysml/metamodel/Usage.java b/app/org/omg/sysml/metamodel/Usage.java
@@ -27,75 +27,75 @@
 import java.util.Set;
 
 public interface Usage extends Feature, SysMLType {
-    List<? extends Usage> getNestedUsage();
-
-    Usage getOwningUsage();
+    Boolean getIsReference();
 
-    Definition getOwningDefinition();
+    Boolean getIsVariation();
 
-    List<? extends PortUsage> getNestedPort();
+    Collection<? extends Usage> getVariant();
 
-    List<? extends ActionUsage> getNestedAction();
+    Collection<? extends VariantMembership> getVariantMembership();
 
-    List<? extends StateUsage> getNestedState();
+    Definition getOwningDefinition();
 
-    List<? extends ConstraintUsage> getNestedConstraint();
+    Usage getOwningUsage();
 
-    Collection<? extends TransitionUsage> getNestedTransition();
+    List<? extends Classifier> getDefinition();
 
-    List<? extends RequirementUsage> getNestedRequirement();
+    List<? extends Usage> getUsage();
 
-    List<? extends CalculationUsage> getNestedCalculation();
+    List<? extends Usage> getDirectedUsage();
 
-    Boolean getIsVariation();
+    List<? extends Usage> getNestedUsage();
 
-    List<? extends Usage> getDirectedUsage();
+    List<? extends ReferenceUsage> getNestedReference();
 
-    List<? extends CaseUsage> getNestedCase();
+    List<? extends AttributeUsage> getNestedAttribute();
 
-    List<? extends AnalysisCaseUsage> getNestedAnalysisCase();
+    List<? extends EnumerationUsage> getNestedEnumeration();
 
-    Collection<? extends VariantMembership> getVariantMembership();
+    List<? extends OccurrenceUsage> getNestedOccurrence();
 
-    List<? extends Usage> getUsage();
+    List<? extends ItemUsage> getNestedItem();
 
-    Collection<? extends Usage> getVariant();
+    List<? extends PartUsage> getNestedPart();
 
-    List<? extends ReferenceUsage> getNestedReference();
+    List<? extends PortUsage> getNestedPort();
 
     List<? extends ConnectorAsUsage> getNestedConnection();
 
-    List<? extends ItemUsage> getNestedItem();
-
-    List<? extends PartUsage> getNestedPart();
+    Collection<? extends FlowConnectionUsage> getNestedFlow();
 
     List<? extends InterfaceUsage> getNestedInterface();
 
-    List<? extends AttributeUsage> getNestedAttribute();
+    List<? extends AllocationUsage> getNestedAllocation();
 
-    List<? extends ViewUsage> getNestedView();
+    List<? extends ActionUsage> getNestedAction();
 
-    List<? extends ViewpointUsage> getNestedViewpoint();
+    List<? extends StateUsage> getNestedState();
 
-    List<? extends RenderingUsage> getNestedRendering();
+    Collection<? extends TransitionUsage> getNestedTransition();
 
-    List<? extends VerificationCaseUsage> getNestedVerificationCase();
+    List<? extends CalculationUsage> getNestedCalculation();
 
-    List<? extends EnumerationUsage> getNestedEnumeration();
+    List<? extends ConstraintUsage> getNestedConstraint();
 
-    List<? extends AllocationUsage> getNestedAllocation();
+    List<? extends RequirementUsage> getNestedRequirement();
 
     Collection<? extends ConcernUsage> getNestedConcern();
 
-    List<? extends OccurrenceUsage> getNestedOccurrence();
+    List<? extends CaseUsage> getNestedCase();
 
-    List<? extends Classifier> getDefinition();
+    List<? extends AnalysisCaseUsage> getNestedAnalysisCase();
+
+    List<? extends VerificationCaseUsage> getNestedVerificationCase();
 
     List<? extends UseCaseUsage> getNestedUseCase();
 
-    Boolean getIsReference();
+    List<? extends ViewUsage> getNestedView();
 
-    Collection<? extends FlowConnectionUsage> getNestedFlow();
+    List<? extends ViewpointUsage> getNestedViewpoint();
+
+    List<? extends RenderingUsage> getNestedRendering();
 
     List<? extends MetadataUsage> getNestedMetadata();
 }
diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,7 @@
 name := """SysML-v2-API-Services"""
 organization := "org.omg"
 
-version := "2023-01"
+version := "2023-02-rc1"
 
 javacOptions ++= Seq("-source", "11", "-target", "11", "-Xlint")