ST6RI-916 org.omg.sysml.model module

.gitignore

@@ -22,6 +22,12 @@ target
 .polyglot.META-INF
 dependency-reduced-pom.xml
 
+#Maven
+.mvn/repository
+.mvn/maven.config
+.m2/
+.polyglot.feature.xml
+
 # VS Code settings
 .vscode/
 

org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF

@@ -19,7 +19,7 @@ Require-Bundle: org.omg.kerml.expressions.xtext,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
- org.omg.sysml;bundle-version="0.2.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.xtext.common.types.ui
 Import-Package: org.apache.log4j
 Export-Package: org.omg.kerml.expressions.xtext.ui.quickfix,

org.omg.kerml.expressions.xtext/.classpath

@@ -6,5 +6,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.omg.kerml.expressions.xtext/.project

@@ -3,6 +3,7 @@
 	<name>org.omg.kerml.expressions.xtext</name>
 	<comment></comment>
 	<projects>
+		<project>org.omg.sysml.model</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF

@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.sysml;bundle-version="0.2.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources,
  org.eclipse.xtext.common.types,

org.omg.kerml.owl/.classpath

@@ -5,6 +5,7 @@
 	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.kerml.xtext"/>
 	<classpathentry kind="output" path="bin"/>

org.omg.kerml.owl/.project

@@ -3,6 +3,7 @@
 	<name>org.omg.kerml.owl</name>
 	<comment></comment>
 	<projects>
+		<project>org.omg.sysml.model</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

org.omg.kerml.owl/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ASCII"?>
 <uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
   <mapping sourceURI="http://www.omg.org/spec/SysML/2.0/OWL" targetURI="platform:/resource/org.omg.kerml.owl/model/generated/Owl.ecore"/>
-  <mapping sourceURI="https://www.omg.org/spec/SysML/20230201" targetURI="platform:/resource/org.omg.sysml/model/SysML.ecore"/>
+  <mapping sourceURI="https://www.omg.org/spec/SysML/20230201" targetURI="platform:/resource/org.omg.sysml.model/src/main/resources/model/SysML.ecore"/>
 </uriMap:MappingContainer>

org.omg.kerml.owl/transforms/SysML2OWL.qvto

@@ -22,7 +22,7 @@
  * 
  *****************************************************************************/
 
-modeltype SysML uses "https://www.omg.org/spec/SysML/20230201";
+modeltype SysML uses "https://www.omg.org/spec/SysML/20250201";
 modeltype OWL uses "http://www.omg.org/spec/SysML/2.0/OWL";
 modeltype Ecore uses "http://www.eclipse.org/emf/2002/Ecore";
 

org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF

@@ -11,9 +11,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.codegen;bundle-version="2.6.0",
  org.eclipse.xtext.xbase;bundle-version="2.9.2",
  org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
- org.omg.sysml;bundle-version="0.2.0",
- org.omg.kerml.xtext;bundle-version="0.2.0",
- org.omg.kerml.xtext.ui;bundle-version="0.2.0",
+ org.omg.sysml;bundle-version="0.59.0",
+ org.omg.kerml.xtext;bundle-version="0.59.0",
+ org.omg.kerml.xtext.ui;bundle-version="0.59.0",
  org.aopalliance;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.omg.kerml.xpect,

org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF

@@ -11,6 +11,6 @@ Require-Bundle: org.omg.kerml.xtext,
  org.eclipse.xtext.ide,
  org.eclipse.xtend.lib,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.kerml.expressions.xtext;bundle-version="0.9.0",
- org.omg.kerml.expressions.xtext.ide;bundle-version="0.9.0"
+ org.omg.kerml.expressions.xtext;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext.ide;bundle-version="0.59.0"
 Export-Package: org.omg.kerml.xtext.ide.contentassist.antlr

org.omg.kerml.xtext.ui/.classpath

@@ -9,6 +9,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.omg.kerml.xtext.ui/.project

@@ -3,6 +3,7 @@
 	<name>org.omg.kerml.xtext.ui</name>
 	<comment></comment>
 	<projects>
+		<project>org.omg.sysml.model</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF

@@ -19,10 +19,11 @@ Require-Bundle: org.omg.kerml.xtext,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
- org.omg.sysml;bundle-version="0.2.0",
- org.omg.kerml.expressions.xtext;bundle-version="0.9.0",
- org.omg.kerml.expressions.xtext.ide;bundle-version="0.9.0",
- org.omg.kerml.expressions.xtext.ui;bundle-version="0.9.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext.ide;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext.ui;bundle-version="0.59.0",
  org.eclipse.xtext.common.types.ui,
  org.eclipse.emf.ecore.editor
 Import-Package: org.apache.log4j

org.omg.kerml.xtext/.classpath

@@ -9,6 +9,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.omg.kerml.xtext/.project

@@ -3,6 +3,7 @@
 	<name>org.omg.kerml.xtext</name>
 	<comment></comment>
 	<projects>
+		<project>org.omg.sysml.model</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

org.omg.kerml.xtext/META-INF/MANIFEST.MF

@@ -13,10 +13,11 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.sysml;bundle-version="0.2.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources,
- org.omg.kerml.expressions.xtext;bundle-version="0.9.0",
+ org.omg.kerml.expressions.xtext;bundle-version="0.59.0",
  com.google.gson,
  org.eclipse.xtext.common.types,
  org.objectweb.asm;bundle-version="9.3.0";resolution:=optional

org.omg.sysml.edit/.classpath

@@ -2,10 +2,21 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
 		<attributes>
-			<attribute name="module" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="/org.omg.sysml.model"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.omg.sysml.edit/.project

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.omg.sysml.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
+	<name>org.omg.sysml.edit</name>
+	<comment></comment>
+	<projects>
+		<project>org.omg.sysml.model</project>
+	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
@@ -20,8 +21,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 	</natures>

org.omg.sysml.edit/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,2 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

org.omg.sysml.edit/.settings/org.eclipse.jdt.core.prefs

@@ -4,6 +4,7 @@ org.eclipse.jdt.core.compiler.compliance=21
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=21

org.omg.sysml.edit/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

org.omg.sysml.edit/META-INF/MANIFEST.MF

@@ -11,7 +11,7 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: org.omg.sysml.lang.sysml.provider
 Require-Bundle: org.eclipse.core.runtime,
- org.omg.sysml;visibility:=reexport,
  org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.uml2.common.edit;visibility:=reexport
+ org.eclipse.uml2.common.edit;visibility:=reexport,
+ org.omg.sysml.model.bundle;bundle-version="0.59.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy

org.omg.sysml.edit/build.properties

@@ -7,4 +7,4 @@ bin.includes = .,\
                plugin.properties
 jars.compile.order = .
 source.. = src/
-output.. = bin/
+output.. = target/classes

org.omg.sysml.edit/pom.xml

@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.omg.sysml</groupId>
+		<artifactId>org.omg.sysml.parent</artifactId>
+		<version>${revision}</version>
+	</parent>
+
+	<artifactId>org.omg.sysml.edit</artifactId>
+	<packaging>eclipse-plugin</packaging>
+
+</project>

org.omg.sysml.editor/.classpath

@@ -2,6 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

org.omg.sysml.editor/.project

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.omg.sysml.editor</name>
-	<comment></comment>
-	<projects>
-	</projects>
+	<name>org.omg.sysml.editor</name>
+	<comment></comment>
+	<projects>
+		<project>org.omg.sysml.model</project>
+	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>

org.omg.sysml.execution/.classpath

@@ -6,6 +6,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

org.omg.sysml.execution/.project

@@ -3,6 +3,7 @@
 	<name>org.omg.sysml.execution</name>
 	<comment></comment>
 	<projects>
+		<project>org.omg.sysml.model</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

org.omg.sysml.execution/META-INF/MANIFEST.MF

@@ -7,5 +7,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Name: org.omg.sysml.execution
 Bundle-Vendor: SysML v2 Submission Team
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.omg.sysml;bundle-version="0.28.0"
 Export-Package: org.omg.sysml.execution.expressions
+Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0"

org.omg.sysml.execution/pom.xml

@@ -12,7 +12,7 @@
 
 	<artifactId>org.omg.sysml.execution</artifactId>
 	<packaging>eclipse-plugin</packaging>
-
+	
 	<build>
 		<plugins>
 			<plugin>

org.omg.sysml.feature/feature.xml

@@ -62,6 +62,13 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES
          version="0.0.0"
          unpack="false"/>
 
+	<plugin
+         id="org.omg.sysml.model.bundle"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.omg.sysml"
          download-size="0"

org.omg.sysml.interactive.tests/.classpath

@@ -6,6 +6,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>

org.omg.sysml.interactive.tests/.project

@@ -3,6 +3,7 @@
 	<name>org.omg.sysml.interactive.tests</name>
 	<comment></comment>
 	<projects>
+		<project>org.omg.sysml.model</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF

@@ -6,7 +6,8 @@ Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true
 Bundle-Version: 0.59.0.qualifier
 Automatic-Module-Name: org.omg.sysml.interactive.tests
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.omg.sysml.interactive;bundle-version="0.3.2",
+Require-Bundle: org.omg.sysml.interactive;bundle-version="0.59.0",
  org.junit;bundle-version="4.12.0",
- org.omg.sysml,
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.xtext;bundle-version="2.22.0"

org.omg.sysml.interactive/.classpath

@@ -6,6 +6,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="/org.omg.sysml.model"/>
 	<classpathentry kind="src" output="target/classes" path="src">
 		<attributes>
 			<attribute name="optional" value="true"/>

org.omg.sysml.interactive/.project

@@ -3,6 +3,7 @@
 	<name>org.omg.sysml.interactive</name>
 	<comment></comment>
 	<projects>
+		<project>org.omg.sysml.model</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

org.omg.sysml.interactive/META-INF/MANIFEST.MF

@@ -8,10 +8,11 @@ Export-Package: org.omg.sysml.interactive
 Require-Bundle: org.eclipse.emf.ecore,
  com.google.inject,
  org.eclipse.xtext,
- org.omg.sysml;bundle-version="0.2.0",
- org.omg.sysml.execution;bundle-version="0.28.0",
- org.omg.kerml.xtext;bundle-version="0.2.0",
- org.omg.sysml.xtext;bundle-version="0.2.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
+ org.omg.sysml.execution;bundle-version="0.59.0",
+ org.omg.kerml.xtext;bundle-version="0.59.0",
+ org.omg.sysml.xtext;bundle-version="0.59.0",
  com.google.gson;bundle-version="2.8.6",
  org.eclipse.xtext.common.types
 Import-Package: org.omg.sysml.plantuml