Merge branch 'master' into ST6RI-846

Author: seidewitz

.github/workflows/build.yml

@@ -29,6 +29,11 @@ jobs:
         cache: maven
     - name: Build with Maven
       run: ./mvnw -B clean verify --file pom.xml
+    - name: Upload SysML Library .kpar files
+      uses: actions/upload-artifact@v5
+      with:
+        name: sysml-library-kpar
+        path: sysml.library/output/*.kpar
     - name: Publish Test Report
       uses: mikepenz/action-junit-report@v5
       if: success() || failure() # always run even if the previous step fails

.github/workflows/maven-publish.yml

@@ -31,3 +31,40 @@ jobs:
       run: ./mvnw -B deploy -DskipTests=true
       env:
         GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password
+    - name: Upload SysML Library .kpar files
+      uses: actions/upload-artifact@v5
+      with:
+        name: sysml-library-kpar
+        path: sysml.library/output/*.kpar
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+    permissions:
+      # Use to sign the release artifacts
+      id-token: write
+      # Used to upload release artifacts
+      contents: write
+      # Used to generate artifact attestation
+      attestations: write
+    steps:
+      - uses: actions/download-artifact@v6
+        with:
+          name: sysml-library-kpar
+          path: kpars
+      - name: Generate artifact attestation
+        uses: actions/attest-build-provenance@v3
+        with:
+          subject-path: 'kpars/*.kpar'
+      - name: Create a release
+        uses: softprops/action-gh-release@v2
+        with:
+          make_latest: true
+          files: |
+            kpars/*
+          overwrite_files: false
+          body:
+          append_body: true
+          name: ${{ github.event.inputs.tag_name || github.event.release.tag_name }} - SysML v2 Pilot Implementation

.gitignore

@@ -37,3 +37,6 @@ dependency-reduced-pom.xml
 
 # Generated Python files
 *.pyc
+
+# Built libraries
+*.kpar

README.adoc

@@ -44,30 +44,34 @@ image:oomph-projects.png[oomph projects]
 
 ==== Manual installation
 
-1. Install Eclipse 2025-03 (4.35) and Xtext.
+1. Install Eclipse 2025-03 (4.35).
    * Install the “Eclipse Modeling Tools” package.
      ** `https://www.eclipse.org/downloads/packages/release/2025-03/r/eclipse-modeling-tools`
 
-   * To install Xtext, select Help > Install New Software, use the update site URL given below, and install “Xtext Complete SDK” (under General Purpose Tools).
-     ** `http://download.eclipse.org/releases/2025-03`
+   * Install additional release packages in Eclipse.
+     ** Select Help > Install New Software.
+     ** Enter the update site URL `http://download.eclipse.org/releases/2025-03`.
+     ** Install “Xtext Complete SDK” (under General Purpose Tools) and "QVT Operational SDK" (under Modeling).
 
-   * (Optional) For PlantUML visualization, you need to install PlantUML-Eclipse with SysMLv2 extensions from
-     the update site of `https://github.com/himi/p2-update-puml-sysmlv2/raw/main/updates` with Help > Install New Software.
+   * (Optional) For PlantUML visualization, install PlantUML-Eclipse with SysMLv2 extensions.
+     ** Select Help > Install New Software
+     ** Enter the update site URL `https://github.com/himi/p2-update-puml-sysmlv2/raw/main/updates`.
+     ** Install "PlantUML Eclipse support".
 
-2. Clone our GitHub repository from the URL below.
+2. Clone the GitHub repository from the URL below.
    * `https://github.com/Systems-Modeling/SySML-v2-Pilot-Implementation.git`
 
 3. Import projects from the repository into your Eclipse workspace. This should include at least the projects:
    * `org.omg.sysml`
    * `org.omg.kerml.expressions.xtext`
    * `org.omg.kerml.expressions.xtext.ide`
    * `org.omg.kerml.expressions.xtext.ui`
-   * `org.kerml.xtext`
-   * `org.kerml.xtext.ide`
-   * `org.kerml.xtext.ui`
-   * `org.sysml.xtext`
-   * `org.sysml.xtext.ide`
-   * `org.sysml.xtext.ui`
+   * `org.omg.kerml.xtext`
+   * `org.omg.kerml.xtext.ide`
+   * `org.omg.kerml.xtext.ui`
+   * `org.omg.sysml.xtext`
+   * `org.omg.sysml.xtext.ide`
+   * `org.omg.sysml.xtext.ui`
 
 4. https://maven.apache.org/[Maven] is used to perform a coordinated build of all projects (including packaging the SysML Interactive JAR file that is used by `org.omg.sysml.jupyter`). 
         * To build the repository, invoke `mvn clean package` from the base `SysML-v2-Pilot-Implementation` directory.

kerml/src/examples/KerML Spec Annex A Examples/A-3-8-ChangingFeatureValues.kerml

@@ -110,15 +110,21 @@ package ChangingFeatureValuesExecution {
 	#atom
 	behavior MyPaint specializes Paint {
 		feature redefines objectToPaint : MyProduct;
-		step redefines painting : PaintingMyProductFeatureWrite;
-		step redefines painted : PaintedMyProductFeatureWrite;
+		step redefines painting : PaintingMyProductFeatureWrite {
+		    in onOccurrence;
+		}
+		step redefines painted : PaintedMyProductFeatureWrite {
+            in onOccurrence;
+        }
 		succession redefines p_before_p : MyPaintingFW_Before_PaintFW_Link first painting then painted;
 	}
 
 	#atom
 	behavior MyDry specializes Dry {
 		feature redefines objectToDry : MyProduct;
-		step redefines dried : MyProductFeatureWrite;  
+		step redefines dried : MyProductFeatureWrite {
+            in onOccurrence;
+        }
 	}
 	#atom
 	assoc MyPaint_Before_Dry_Link specializes HappensBefore {
@@ -128,7 +134,9 @@ package ChangingFeatureValuesExecution {
 	#atom
 	behavior MyShip specializes Ship {
 		feature redefines objectToShip : MyProduct;
-		step redefines shipped : MyProductFeatureWrite;  
+		step redefines shipped : MyProductFeatureWrite {
+            in onOccurrence;
+        }
 	}
 	#atom
 	assoc MyDry_Before_Ship_Link specializes HappensBefore {
@@ -144,7 +152,9 @@ package ChangingFeatureValuesExecution {
 		feature obPiS chains objectToFinish.beforePaint.isShipped = false;
 
 
-		step redefines paint : MyPaint;
+		step redefines paint : MyPaint {
+		    feature redefines paint::objectToPaint, MyPaint::objectToPaint;
+		}
 		feature subsets objectToFinish.beforePaint.immediateSuccessors,
 				objectToFinish.whilePainting.startShot.timeCoincidentOccurrences
 			chains paint.painting.endShot;
@@ -161,7 +171,9 @@ package ChangingFeatureValuesExecution {
 		feature oaPiS chains objectToFinish.afterPaint.isShipped = false;
 
 
-		step redefines dry : MyDry;
+		step redefines dry : MyDry {
+            feature redefines dry::objectToDry, MyDry::objectToDry;
+        }
 		succession redefines p_before_d : MyPaint_Before_Dry_Link [1] first paint then dry;
 		feature subsets objectToFinish.afterPaint.immediateSuccessors,
 				objectToFinish.afterDry.startShot.timeCoincidentOccurrences
@@ -171,7 +183,9 @@ package ChangingFeatureValuesExecution {
 		feature oaDiS chains objectToFinish.afterDry.isShipped = false;
 
 
-		step redefines ship : MyShip;
+		step redefines ship : MyShip {
+            feature redefines ship::objectToShip, MyShip::objectToShip;
+        }
 		succession redefines d_before_s : MyDry_Before_Ship_Link [1] first dry then ship;
 		feature subsets objectToFinish.afterDry.immediateSuccessors,
 				objectToFinish.afterShip.startShot.timeCoincidentOccurrences

kerml/src/examples/Simple Tests/Associations.kerml

@@ -1,11 +1,27 @@
-package Associations {	
+package Associations {
+    datatype X;
+    class Y;
+    
 	assoc A {
-		end x;
-		end [1..*] feature y;
+		end x_cross [1..1] feature x : X; 
+		end y_cross [1..*] feature y : Y;
 	}
 
 	assoc B specializes A {
 		end x1;
 		end [0..*] feature y1 redefines y;
 	}
+	
+	assoc struct C {
+		const end [1] feature a;
+		const end feature b;
+	}
+	
+	metaclass M;	
+	assoc XY {
+		end [0..1] feature x : X {
+			@M;
+		}
+		end feature y : Y;
+	}
 }

kerml/src/examples/Simple Tests/Behaviors.kerml

@@ -13,6 +13,9 @@ package Behaviors {
     class C {
         var z = A().y;
         step a : A;
+        step b : B;
         binding z = a.y;
+        flow a.y to b.x1;
     }
+    abstract flow msg of C;
 }

kerml/src/examples/Simple Tests/MetadataTest.kerml

@@ -38,4 +38,18 @@ package MetadataTest {
 	    }
 	}
 
+    class CC;
+    struct SS {
+        feature cc : CC;
+    }
+    
+    metaclass M :> Metaobjects::SemanticMetadata {
+      :>> annotatedElement : KerML::Class;
+      :>> baseType = if annotatedElement istype KerML::Structure ? 
+                         SS meta KerML::Type else CC meta KerML::Class;
+    }
+    
+    #M struct T {
+        feature :>> cc;
+    }
 }

kerml/src/examples/Simple Tests/Redefinition.kerml

@@ -1,15 +1,23 @@
 package Redefinition {
-	class Occurrence;
-	class Transfer {
-		feature transferSource;
-		feature item;
-		assoc SourceOutputLink specializes Objects::BinaryLinkObject {
-			end [1] feature source: Occurrence;
-			end [1..*] feature target: Occurrence;
-		}
-		connector sourceOutputLink: SourceOutputLink[1..*] from transferSource to item {
-			feature startShot: Occurrence redefines SourceOutputLink::startShot;
-			feature endShot: Occurrence redefines SourceOutputLink::endShot;
-		}
+	
+	classifier A {
+	    feature f;
+	}
+	
+	classifier B specializes A {
+	    feature redefines f {
+	        feature g;
+	    }
+	}
+	
+	classifier C specializes A, B {
+	    feature subsets f {
+	        feature redefines g;
+	    }
+	}
+
+	class X {
+		feature redefines startShot;
+		feature redefines endShot;
 	}
 }

kerml/src/examples/Variable Feature Examples/Enhancements/ExtendedOccurrences.kerml

@@ -47,4 +47,8 @@ package ExtendedOccurrences {
         	connector : Occurrences::HappensDuring from [1] that to [1] self;
         }
     }
+    struct ExtendedObject :> ExtendedOccurrence {
+        feature self : ExtendedObject :>> Objects::Object::self, ExtendedOccurrence::self;
+    }
+
 }