diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2923ebb6..c12f8b1c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index ab5f168e8..505288ea6 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -19,10 +19,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Remove -snapshot from version diff --git a/README.adoc b/README.adoc index 95629e0ae..06756b0b0 100644 --- a/README.adoc +++ b/README.adoc @@ -19,9 +19,11 @@ The project provides a configuration file for the https://wiki.eclipse.org/Eclip + image:installer-advanced.png[switch to advanced mode] -4. In the product list, select "Eclipse Modeling Tools" with Product Version: 2024-03. +4. In the Products window, select "Eclipse Modeling Tools" with: + * Product Version: 2025-03 + * Java VM: Java 21 -5. In the Projects window, to the right of the text box, click the "+" to the add the Sysml2 project as user project. In the dialog, choose Catalog: Github Projects and browse the file system to select the setup file from the local git repository. +5. On the next page (Projects window), to the right of the text box, click the "+" to the add the Sysml2 project as user project. In the dialog, choose Catalog: Github Projects and browse the file system to select the setup file from the local git repository. * e.g. `file:/C:/git/sysml/SysML-v2-Pilot-Implementation/org.omg.sysml.installer/SysML2.setup` * **Note:** If you have installed the SysML v2 Pilot Implementation previously, this may already be pre-selected. @@ -30,9 +32,9 @@ image:installer-advanced.png[switch to advanced mode] image:oomph-projects.png[oomph projects] 7. On the next page, update the following variables, then press Next. - * Git clone location rule: Select "Located in specific absolute folder location" and browse to the directory for the SysML git repository. - * Root install folder: Change this if you wish the installation to be under a specific folder. - * Workspace location rule: Change this if you wish to place the workspace at a specific location. + * Installation folder name: Change this if you wish the installation to be under a specific folder. + * Workspace folder name: Change this if you wish to place the workspace at a specific location. + * Git clone location: Browse to the directory for the SysML git repository. 8. On the Confirmation page, press Finish. @@ -42,12 +44,12 @@ image:oomph-projects.png[oomph projects] ==== Manual installation -1. Install Eclipse 2024-03 (4.25) and Xtext. +1. Install Eclipse 2025-03 (4.35) and Xtext. * Install the “Eclipse Modeling Tools” package. - ** `https://www.eclipse.org/downloads/packages/release/2024-03/r/eclipse-modeling-tools` + ** `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/2024-03` + ** `http://download.eclipse.org/releases/2025-03` * (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. @@ -67,19 +69,14 @@ image:oomph-projects.png[oomph projects] * `org.sysml.xtext.ide` * `org.sysml.xtext.ui` -**Note:** - - * https://gradle.org/[Gradle] is used to build project `org.omg.sysml.jupyter`. - * 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`). +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. * If you have https://www.eclipse.org/m2e/[M2Eclipse] installed (with the Tycho Project Configurators connector), it can also launch a Maven build in Eclipse using the launch configuration in `SysML-v2-Pilot-Implementation/launch`. === Prototype SysML Implementation ==== Getting Started -1. Find the file `org.omg.kerml.expressions.xtext/src/org.omg.kerml.expressions.xtext/KerMLExpressions.xtext`, right click on it, and select Run As > Generate Xtext Artifacts, to execute the Xtext generator. Repeat with `org.omg.kerml.xtext/src/org.omg.kerml.xtext/KerML.xtext` and `org.omg.sysml.xtext/src/org.omg.sysml.xtext/SysML.xtext`. - -2. Once the generation is complete, right click on project `org.omg.sysml`, and select Run As > Eclipse Application. This should launch a new runtime Eclipse instance. +1. Right click on project `org.omg.sysml`, and select Run As > Eclipse Application. This should launch a new runtime Eclipse instance. 3. Add the SysML-v2-Pilot-Implementation Git repository (already cloned previously) to the runtime Eclipse instance. @@ -138,7 +135,7 @@ Set up a Java code template as follows: ---- /** * SysML 2 Pilot Implementation - * Copyright (C) 2020 California Institute of Technology ("Caltech") + * Copyright (C) 2025 * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -161,7 +158,7 @@ Set up a Java code template as follows: === For existing code * When modifying existing code created by someone in a different organization, add a new copyright line, without changing anything else in the header. -* When modifying existing code for the first time in a new year, add the year as the latest year in the appropriate copy right line. (E.g., in 2021, "Copyright (C) 2020" becomes "Copyright (C) 2020-2021" and in 2022 it becomes "Copyright (C) 2020-2022".) +* When modifying existing code for the first time in a new year, add the year as the latest year in the appropriate copy right line. (E.g., in 2025, "Copyright (C) 2024" becomes "Copyright (C) 2024-2025" and in 2026 it becomes "Copyright (C) 2024-2026".) === Sources * https://www.gnu.org/licenses/gpl-3.0.en.html[GNU GPL v3.0 - How to Apply These Terms to Your New Programs] diff --git a/org.omg.kerml.expressions.xtext.ide/.classpath b/org.omg.kerml.expressions.xtext.ide/.classpath index 277a60274..c1b088dcb 100644 --- a/org.omg.kerml.expressions.xtext.ide/.classpath +++ b/org.omg.kerml.expressions.xtext.ide/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.expressions.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.expressions.xtext.ide/.settings/org.eclipse.jdt.core.prefs index d4540a53f..3a79233b1 100644 --- a/org.omg.kerml.expressions.xtext.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.expressions.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF index 7b1294559..3ef91926e 100644 --- a/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF +++ b/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.kerml.expressions.xtext.ide Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ide +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.expressions.xtext, diff --git a/org.omg.kerml.expressions.xtext.ui/.classpath b/org.omg.kerml.expressions.xtext.ui/.classpath index 382813bea..9e55310c5 100644 --- a/org.omg.kerml.expressions.xtext.ui/.classpath +++ b/org.omg.kerml.expressions.xtext.ui/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.expressions.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.expressions.xtext.ui/.settings/org.eclipse.jdt.core.prefs index d4540a53f..3a79233b1 100644 --- a/org.omg.kerml.expressions.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.expressions.xtext.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF index 5024b9170..fa4c26255 100644 --- a/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.kerml.expressions.xtext.ui Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ui +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.expressions.xtext, diff --git a/org.omg.kerml.expressions.xtext/.classpath b/org.omg.kerml.expressions.xtext/.classpath index 382813bea..9e55310c5 100644 --- a/org.omg.kerml.expressions.xtext/.classpath +++ b/org.omg.kerml.expressions.xtext/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.expressions.xtext/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.expressions.xtext/.settings/org.eclipse.jdt.core.prefs index d4540a53f..3a79233b1 100644 --- a/org.omg.kerml.expressions.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.expressions.xtext/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF index cc4b0c310..f1757bb5f 100644 --- a/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF +++ b/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.kerml.expressions.xtext Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext -Bundle-Version: 0.49.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, diff --git a/org.omg.kerml.owl.ide/.classpath b/org.omg.kerml.owl.ide/.classpath index a61354428..7994b6938 100644 --- a/org.omg.kerml.owl.ide/.classpath +++ b/org.omg.kerml.owl.ide/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.owl.ide/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.owl.ide/.settings/org.eclipse.jdt.core.prefs index 0c68a61dc..3a79233b1 100644 --- a/org.omg.kerml.owl.ide/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.owl.ide/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF b/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF index d9eed6a1c..8a052aa30 100644 --- a/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF +++ b/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.owl.ide +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: My Company -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.owl, diff --git a/org.omg.kerml.owl.ui/.classpath b/org.omg.kerml.owl.ui/.classpath index a61354428..7994b6938 100644 --- a/org.omg.kerml.owl.ui/.classpath +++ b/org.omg.kerml.owl.ui/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.owl.ui/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.owl.ui/.settings/org.eclipse.jdt.core.prefs index 0c68a61dc..3a79233b1 100644 --- a/org.omg.kerml.owl.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.owl.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF b/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF index b27fd3a11..f7606a3f0 100644 --- a/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF +++ b/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.owl.ui +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: My Company -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.owl, diff --git a/org.omg.kerml.owl/.classpath b/org.omg.kerml.owl/.classpath index 687a1dad6..3d8e660ac 100644 --- a/org.omg.kerml.owl/.classpath +++ b/org.omg.kerml.owl/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.owl/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.owl/.settings/org.eclipse.jdt.core.prefs index 0c68a61dc..1e0cb16bb 100644 --- a/org.omg.kerml.owl/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.owl/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate 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.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.owl/META-INF/MANIFEST.MF b/org.omg.kerml.owl/META-INF/MANIFEST.MF index d4531137f..fa4564461 100644 --- a/org.omg.kerml.owl/META-INF/MANIFEST.MF +++ b/org.omg.kerml.owl/META-INF/MANIFEST.MF @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.owl +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: My Company -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, diff --git a/org.omg.kerml.owl/model/generated/Owl.genmodel b/org.omg.kerml.owl/model/generated/Owl.genmodel index 457311c89..7362c58ca 100644 --- a/org.omg.kerml.owl/model/generated/Owl.genmodel +++ b/org.omg.kerml.owl/model/generated/Owl.genmodel @@ -2,7 +2,7 @@ diff --git a/org.omg.kerml.xpect.tests/.classpath b/org.omg.kerml.xpect.tests/.classpath index 409868ec3..fb1a31fc8 100644 --- a/org.omg.kerml.xpect.tests/.classpath +++ b/org.omg.kerml.xpect.tests/.classpath @@ -1,12 +1,20 @@ - + - - + + + + + + + + + + diff --git a/org.omg.kerml.xpect.tests/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.xpect.tests/.settings/org.eclipse.jdt.core.prefs index a67808990..f5d3a1b0b 100644 --- a/org.omg.kerml.xpect.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.xpect.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,12 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF b/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF index 34b2ef9eb..865bc6fda 100644 --- a/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF @@ -1,9 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xpect.tests +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.xpect.xtext.lib;bundle-version="[0.3.0,0.4.0)", org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)", diff --git a/org.omg.kerml.xpect.tests/build.properties b/org.omg.kerml.xpect.tests/build.properties index ddf2713bf..a9d7bc7d8 100644 --- a/org.omg.kerml.xpect.tests/build.properties +++ b/org.omg.kerml.xpect.tests/build.properties @@ -5,4 +5,5 @@ bin.includes = META-INF/,\ .,\ plugin.properties,\ plugin.xml +additional.bundles = io.github.classgraph.classgraph diff --git a/org.omg.kerml.xtext.ide/.classpath b/org.omg.kerml.xtext.ide/.classpath index ef36216f7..ba93cb30b 100644 --- a/org.omg.kerml.xtext.ide/.classpath +++ b/org.omg.kerml.xtext.ide/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.xtext.ide/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.kerml.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF b/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF index eb369795d..ff757bf27 100644 --- a/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.kerml.xtext.ide Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ide +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.xtext, diff --git a/org.omg.kerml.xtext.ui/.classpath b/org.omg.kerml.xtext.ui/.classpath index 9a4b5023b..0a13a3c63 100644 --- a/org.omg.kerml.xtext.ui/.classpath +++ b/org.omg.kerml.xtext.ui/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 444e1bcc5..23fa13b17 100644 --- a/org.omg.kerml.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.kerml.xtext.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,9 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF index f07a48466..eced94235 100644 --- a/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.kerml.xtext.ui Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ui +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.xtext, diff --git a/org.omg.kerml.xtext/.classpath b/org.omg.kerml.xtext/.classpath index 9a4b5023b..0a13a3c63 100644 --- a/org.omg.kerml.xtext/.classpath +++ b/org.omg.kerml.xtext/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.kerml.xtext/.settings/org.eclipse.jdt.core.prefs b/org.omg.kerml.xtext/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.kerml.xtext/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.kerml.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.xtext/META-INF/MANIFEST.MF index 871ae38b2..9910c837b 100644 --- a/org.omg.kerml.xtext/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.kerml.xtext Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext -Bundle-Version: 0.49.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.kerml.xtext; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, diff --git a/org.omg.sysml.edit/.classpath b/org.omg.sysml.edit/.classpath index cef1abacf..35386b94b 100644 --- a/org.omg.sysml.edit/.classpath +++ b/org.omg.sysml.edit/.classpath @@ -1,11 +1,11 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/org.omg.sysml.edit/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.edit/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.edit/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.edit/META-INF/MANIFEST.MF b/org.omg.sysml.edit/META-INF/MANIFEST.MF index 97f40f3ba..7d47df520 100644 --- a/org.omg.sysml.edit/META-INF/MANIFEST.MF +++ b/org.omg.sysml.edit/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.omg.sysml.edit;singleton:=true Automatic-Module-Name: org.omg.sysml.edit -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.omg.sysml.lang.sysml.provider.SysMLEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.omg.sysml.lang.sysml.provider Require-Bundle: org.eclipse.core.runtime, org.omg.sysml;visibility:=reexport, diff --git a/org.omg.sysml.editor.feature/feature.xml b/org.omg.sysml.editor.feature/feature.xml index be483d56a..fe882970c 100644 --- a/org.omg.sysml.editor.feature/feature.xml +++ b/org.omg.sysml.editor.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.omg.sysml.editor/.classpath b/org.omg.sysml.editor/.classpath index b6ada0807..375961e4d 100644 --- a/org.omg.sysml.editor/.classpath +++ b/org.omg.sysml.editor/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/org.omg.sysml.editor/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.editor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.editor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.editor/META-INF/MANIFEST.MF b/org.omg.sysml.editor/META-INF/MANIFEST.MF index fc6dbb667..45bf0df5d 100644 --- a/org.omg.sysml.editor/META-INF/MANIFEST.MF +++ b/org.omg.sysml.editor/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.omg.sysml.editor;singleton:=true Automatic-Module-Name: org.omg.sysml.editor -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.omg.sysml.lang.sysml.presentation.SysMLEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Export-Package: org.omg.sysml.lang.sysml.presentation Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources;visibility:=reexport, diff --git a/org.omg.sysml.execution/.classpath b/org.omg.sysml.execution/.classpath index fe1a20532..6f2bbb604 100644 --- a/org.omg.sysml.execution/.classpath +++ b/org.omg.sysml.execution/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.omg.sysml.execution/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.execution/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.execution/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.execution/META-INF/MANIFEST.MF b/org.omg.sysml.execution/META-INF/MANIFEST.MF index b497513ef..fcc5ef58a 100644 --- a/org.omg.sysml.execution/META-INF/MANIFEST.MF +++ b/org.omg.sysml.execution/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.omg.sysml.execution;singleton:=true -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Automatic-Module-Name: org.omg.sysml.execution -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Name: org.omg.sysml.execution Bundle-Vendor: SysML v2 Submission Team Bundle-ActivationPolicy: lazy diff --git a/org.omg.sysml.feature/feature.xml b/org.omg.sysml.feature/feature.xml index 071cd89a4..5656181ac 100644 --- a/org.omg.sysml.feature/feature.xml +++ b/org.omg.sysml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.omg.sysml.installer/SysML2.setup b/org.omg.sysml.installer/SysML2.setup index cb2495795..335ac5f96 100644 --- a/org.omg.sysml.installer/SysML2.setup +++ b/org.omg.sysml.installer/SysML2.setup @@ -16,9 +16,9 @@ label="SysML2"> + version="JavaSE-21" + location="${jre.location-21}" + name="JRE for JavaSE-21"> Define the JRE needed to compile and run the Java projects of ${scope.project.label} + + url="http://download.eclipse.org/releases/2025-03/"/> + url="https://download.eclipse.org/xpect/updates/nightly/N202505300357"/> Install the tools needed in the IDE to work with the source code for ${scope.project.label} @@ -81,7 +83,7 @@ + name="SysMLv2 2025-03 Target"/> - + - - - + + + + + + + + - diff --git a/org.omg.sysml.interactive.tests/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.interactive.tests/.settings/org.eclipse.jdt.core.prefs index 4ede96d8a..5500104fb 100644 --- a/org.omg.sysml.interactive.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.interactive.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,10 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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 diff --git a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF index a04920f8b..1ce3f4dfa 100644 --- a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF +++ b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Automatic-Module-Name: org.omg.sysml.interactive.tests Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.sysml.interactive;bundle-version="0.3.2", diff --git a/org.omg.sysml.interactive/.classpath b/org.omg.sysml.interactive/.classpath index 31cd1ca94..f62087d70 100644 --- a/org.omg.sysml.interactive/.classpath +++ b/org.omg.sysml.interactive/.classpath @@ -1,10 +1,20 @@ - + + + + + - + + + + + + + - + diff --git a/org.omg.sysml.interactive/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.interactive/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.interactive/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.interactive/META-INF/MANIFEST.MF b/org.omg.sysml.interactive/META-INF/MANIFEST.MF index 976b5803b..4348530a4 100644 --- a/org.omg.sysml.interactive/META-INF/MANIFEST.MF +++ b/org.omg.sysml.interactive/META-INF/MANIFEST.MF @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.interactive +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.interactive -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Export-Package: org.omg.sysml.interactive Require-Bundle: org.eclipse.emf.ecore, com.google.inject, diff --git a/org.omg.sysml.jupyter.installer/.classpath b/org.omg.sysml.jupyter.installer/.classpath index c6bb293e0..47418c14f 100644 --- a/org.omg.sysml.jupyter.installer/.classpath +++ b/org.omg.sysml.jupyter.installer/.classpath @@ -13,7 +13,7 @@ - + diff --git a/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs index 4ede96d8a..8b942392f 100644 --- a/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.jupyter.installer/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,8 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.jupyter.installer/README.adoc b/org.omg.sysml.jupyter.installer/README.adoc index cda4f04cb..ad686b240 100644 --- a/org.omg.sysml.jupyter.installer/README.adoc +++ b/org.omg.sysml.jupyter.installer/README.adoc @@ -2,7 +2,7 @@ == All Operating Systems -1. Install Java 11+, e.g. https://adoptopenjdk.net/index.html?variant=openjdk11&jvmVariant=hotspot[OpenJDK 11]. +1. Install Java 21+, e.g. https://adoptium.net/temurin/releases/?os=any&arch=any&version=21[OpenJDK 21]. * You can check the Java version you have installed by running `java -version` in Terminal (Linux / macOS) or Command Prompt (Windows). See https://www.baeldung.com/java-check-is-installed[How to Check if Java is Installed]. 2. Install https://docs.conda.io/en/latest/miniconda.html[Miniconda] with Python version 3.x. * **[Windows]** During installation, enable the "Add Anaconda to my PATH environment variable" option. See https://medium.com/@GalarnykMichael/install-python-on-windows-anaconda-c63c7c3d1444[Install Python on Windows] diff --git a/org.omg.sysml.jupyter.installer/pom.xml b/org.omg.sysml.jupyter.installer/pom.xml index f4db29467..b75d573be 100644 --- a/org.omg.sysml.jupyter.installer/pom.xml +++ b/org.omg.sysml.jupyter.installer/pom.xml @@ -101,7 +101,9 @@ --> . - **/** + + **/** + diff --git a/org.omg.sysml.jupyter.jupyterlab/.classpath b/org.omg.sysml.jupyter.jupyterlab/.classpath index c6bb293e0..fe279107c 100644 --- a/org.omg.sysml.jupyter.jupyterlab/.classpath +++ b/org.omg.sysml.jupyter.jupyterlab/.classpath @@ -6,34 +6,34 @@ - + - - + - + + + - + + + - + - - + - - diff --git a/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs index 4ede96d8a..8b942392f 100644 --- a/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.jupyter.jupyterlab/.settings/org.eclipse.jdt.core.prefs @@ -1,2 +1,8 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.jupyter.jupyterlab/package.json b/org.omg.sysml.jupyter.jupyterlab/package.json index e7d3c171d..f8582b3a2 100644 --- a/org.omg.sysml.jupyter.jupyterlab/package.json +++ b/org.omg.sysml.jupyter.jupyterlab/package.json @@ -1,6 +1,6 @@ { "name": "@systems-modeling/jupyterlab-sysml", - "version": "0.49.0-SNAPSHOT", + "version": "0.50.0-SNAPSHOT", "description": "A JupyterLab extension for system modeling using SysML", "repository": "github:Systems-Modeling/SysML-v2-Pilot-Implementation", "author": "SysML v2 Submission Team", diff --git a/org.omg.sysml.jupyter.jupyterlab/pom.xml b/org.omg.sysml.jupyter.jupyterlab/pom.xml index bd2b297e8..f324e064d 100644 --- a/org.omg.sysml.jupyter.jupyterlab/pom.xml +++ b/org.omg.sysml.jupyter.jupyterlab/pom.xml @@ -126,7 +126,6 @@ org.apache.maven.plugins maven-clean-plugin - ${maven-clean-plugin.version} diff --git a/org.omg.sysml.jupyter.kernel/.classpath b/org.omg.sysml.jupyter.kernel/.classpath index 8d51af379..17e6953bd 100644 --- a/org.omg.sysml.jupyter.kernel/.classpath +++ b/org.omg.sysml.jupyter.kernel/.classpath @@ -19,7 +19,7 @@ - + diff --git a/org.omg.sysml.jupyter.kernel/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.jupyter.kernel/.settings/org.eclipse.jdt.core.prefs index af7ce860b..c3b983f55 100644 --- a/org.omg.sysml.jupyter.kernel/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.jupyter.kernel/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -13,4 +13,4 @@ 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=disabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.jupyter.kernel/README.adoc b/org.omg.sysml.jupyter.kernel/README.adoc index e9d01848a..994c7e965 100644 --- a/org.omg.sysml.jupyter.kernel/README.adoc +++ b/org.omg.sysml.jupyter.kernel/README.adoc @@ -1,12 +1,12 @@ = Jupyter SysML Kernel -A http://jupyter.org/[Jupyter] kernel for executing SysML v2 models. The kernel executes models via the new SysML textual language. Some of the additional commands should be supported as needed via a syntax similar to the IPython magics. +A http://jupyter.org/[Jupyter] kernel for executing SysML v2 models. The kernel executes models via the new SysML textual language. Built on top of https://github.com/SpencerPark/jupyter-jvm-basekernel[jupyter-jvm-basekernel]. == Requirements -1. http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java >= 17]. +1. http://www.oracle.com/technetwork/java/javase/downloads/index.html[Java >= 21]. 2. Some Jupyter-like environment to use the kernel in. A non-exhaustive list of options: * http://jupyter.org/install[Jupyter] * http://jupyterlab.readthedocs.io/en/stable/getting_started/installation.html[JupyterLab] @@ -28,7 +28,7 @@ Get the latest _release_ of the software with no compilation needed. See < com.google.code.gson gson - 2.10 + 2.12.1 provided @@ -95,7 +95,9 @@ --> . - **/** + + **/** + diff --git a/org.omg.sysml.plantuml.eclipse/.classpath b/org.omg.sysml.plantuml.eclipse/.classpath index fe1a20532..6f2bbb604 100644 --- a/org.omg.sysml.plantuml.eclipse/.classpath +++ b/org.omg.sysml.plantuml.eclipse/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.omg.sysml.plantuml.eclipse/.settings/org.eclipse.core.resources.prefs b/org.omg.sysml.plantuml.eclipse/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/org.omg.sysml.plantuml.eclipse/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.omg.sysml.plantuml.eclipse/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.plantuml.eclipse/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.plantuml.eclipse/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF b/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF index 751fbf699..eb3ce3831 100644 --- a/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF +++ b/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.sysml.plantuml Bundle-ManifestVersion: 2 Bundle-Name: SysML 2 PlantUML visualization for Eclipse +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.plantuml.eclipse;singleton:=true -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Import-Package: net.sourceforge.plantuml.eclipse.utils;version="1.1.25.himi1", net.sourceforge.plantuml.ecore, net.sourceforge.plantuml.text, diff --git a/org.omg.sysml.plantuml.feature/.settings/org.eclipse.core.resources.prefs b/org.omg.sysml.plantuml.feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/org.omg.sysml.plantuml.feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.omg.sysml.plantuml.feature/feature.xml b/org.omg.sysml.plantuml.feature/feature.xml index b2b002ae4..552e538a5 100644 --- a/org.omg.sysml.plantuml.feature/feature.xml +++ b/org.omg.sysml.plantuml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.omg.sysml.plantuml/.classpath b/org.omg.sysml.plantuml/.classpath index fe1a20532..6f2bbb604 100644 --- a/org.omg.sysml.plantuml/.classpath +++ b/org.omg.sysml.plantuml/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.omg.sysml.plantuml/.settings/org.eclipse.core.resources.prefs b/org.omg.sysml.plantuml/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/org.omg.sysml.plantuml/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.omg.sysml.plantuml/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.plantuml/.settings/org.eclipse.jdt.core.prefs index d4540a53f..3a79233b1 100644 --- a/org.omg.sysml.plantuml/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.plantuml/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.plantuml/META-INF/MANIFEST.MF b/org.omg.sysml.plantuml/META-INF/MANIFEST.MF index 488198cd9..53cc6786e 100644 --- a/org.omg.sysml.plantuml/META-INF/MANIFEST.MF +++ b/org.omg.sysml.plantuml/META-INF/MANIFEST.MF @@ -1,9 +1,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SysML 2 PlantUML visualization +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.plantuml Automatic-Module-Name: org.omg.sysml.plantuml -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Export-Package: org.omg.sysml.plantuml Import-Package: com.google.common.collect, com.google.inject;version="1.3.0", diff --git a/org.omg.sysml.site/.project b/org.omg.sysml.site/.project index d665259fe..c4694eab4 100644 --- a/org.omg.sysml.site/.project +++ b/org.omg.sysml.site/.project @@ -4,14 +4,4 @@ - - - org.eclipse.pde.UpdateSiteBuilder - - - - - - org.eclipse.pde.UpdateSiteNature - diff --git a/org.omg.sysml.site/.settings/org.eclipse.core.resources.prefs b/org.omg.sysml.site/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/org.omg.sysml.site/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.omg.sysml.site/README.adoc b/org.omg.sysml.site/README.adoc index 072859d84..796feff52 100644 --- a/org.omg.sysml.site/README.adoc +++ b/org.omg.sysml.site/README.adoc @@ -1,8 +1,8 @@ = SysML v2 Release Eclipse Installation -*Requirements:* Eclipse 2024-03 (4.31), with Java Development Kit +*Requirements:* Eclipse 2025-03 (4.35), with Java Development Kit -(*Note:* The release may work on later versions of Eclipse, but it has only been tested on 2024-03.) +(*Note:* The release may work on later versions of Eclipse, but it has only been tested on 2025-03.) == Installing the plugins diff --git a/org.omg.sysml.site/pom.xml b/org.omg.sysml.site/pom.xml index 9abc98579..6c223d21c 100644 --- a/org.omg.sysml.site/pom.xml +++ b/org.omg.sysml.site/pom.xml @@ -7,7 +7,6 @@ org.omg.sysml.parent ${revision} - org.omg.sysml org.omg.sysml.site eclipse-repository @@ -36,7 +35,9 @@ --> . - **/** + + **/** + diff --git a/org.omg.sysml.target/org.omg.sysml.target.target b/org.omg.sysml.target/org.omg.sysml.target.target index 9c1a88624..fd1b7777f 100644 --- a/org.omg.sysml.target/org.omg.sysml.target.target +++ b/org.omg.sysml.target/org.omg.sysml.target.target @@ -1,17 +1,17 @@ - + - - - - - + + + + + - - - + + + @@ -19,11 +19,11 @@ - - - - + + + + - + \ No newline at end of file diff --git a/org.omg.sysml.uml.ecore.importer/.classpath b/org.omg.sysml.uml.ecore.importer/.classpath index 3628e3368..35386b94b 100644 --- a/org.omg.sysml.uml.ecore.importer/.classpath +++ b/org.omg.sysml.uml.ecore.importer/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.omg.sysml.uml.ecore.importer/.settings/org.eclipse.core.resources.prefs b/org.omg.sysml.uml.ecore.importer/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/org.omg.sysml.uml.ecore.importer/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.omg.sysml.uml.ecore.importer/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.uml.ecore.importer/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.uml.ecore.importer/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.uml.ecore.importer/META-INF/MANIFEST.MF b/org.omg.sysml.uml.ecore.importer/META-INF/MANIFEST.MF index 47c16b60e..ed27ffa86 100644 --- a/org.omg.sysml.uml.ecore.importer/META-INF/MANIFEST.MF +++ b/org.omg.sysml.uml.ecore.importer/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Custom UML Importer -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.uml.ecore.importer;singleton:=true Bundle-Version: 1.0.0.qualifier Automatic-Module-Name: org.omg.sysml.uml.ecore.importer diff --git a/org.omg.sysml.xpect.tests/.classpath b/org.omg.sysml.xpect.tests/.classpath index 0aa894324..da7afd46e 100644 --- a/org.omg.sysml.xpect.tests/.classpath +++ b/org.omg.sysml.xpect.tests/.classpath @@ -1,15 +1,31 @@ - + - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/org.omg.sysml.xpect.tests/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.xpect.tests/.settings/org.eclipse.jdt.core.prefs index 40ff3f98e..a37604ec8 100644 --- a/org.omg.sysml.xpect.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.xpect.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,13 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 diff --git a/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF b/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF index 8e5abad3f..40e9e8c35 100644 --- a/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF @@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xpect.tests +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.xpect.tests;singleton:=true -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.xpect.xtext.lib;bundle-version="0.3.0", org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)", diff --git a/org.omg.sysml.xpect.tests/build.properties b/org.omg.sysml.xpect.tests/build.properties index 4f9f5e52b..ea96ea9f6 100644 --- a/org.omg.sysml.xpect.tests/build.properties +++ b/org.omg.sysml.xpect.tests/build.properties @@ -6,4 +6,5 @@ output.. = target/classes/ bin.includes = .,\ plugin.xml,\ META-INF/ +additional.bundles = io.github.classgraph.classgraph diff --git a/org.omg.sysml.xtext.ide/.classpath b/org.omg.sysml.xtext.ide/.classpath index ef36216f7..ba93cb30b 100644 --- a/org.omg.sysml.xtext.ide/.classpath +++ b/org.omg.sysml.xtext.ide/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.sysml.xtext.ide/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.xtext.ide/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.xtext.ide/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF b/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF index 9ecf518b2..7dc86ff41 100644 --- a/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.sysml.xtext.ide Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xtext.ide +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.sysml.xtext.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.sysml.xtext, diff --git a/org.omg.sysml.xtext.ui/.classpath b/org.omg.sysml.xtext.ui/.classpath index 63bd5e611..25806beed 100644 --- a/org.omg.sysml.xtext.ui/.classpath +++ b/org.omg.sysml.xtext.ui/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.sysml.xtext.ui/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.xtext.ui/.settings/org.eclipse.jdt.core.prefs index 444e1bcc5..23fa13b17 100644 --- a/org.omg.sysml.xtext.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.xtext.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,9 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF index 6ec7d3bb0..4716e0f42 100644 --- a/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF @@ -2,7 +2,8 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.sysml.xtext.ui Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xtext.ui -Bundle-Version: 0.49.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.sysml.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.sysml;bundle-version="0.2.0", diff --git a/org.omg.sysml.xtext/.classpath b/org.omg.sysml.xtext/.classpath index 0dcac8461..5a652ad97 100644 --- a/org.omg.sysml.xtext/.classpath +++ b/org.omg.sysml.xtext/.classpath @@ -3,7 +3,7 @@ - + diff --git a/org.omg.sysml.xtext/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.xtext/.settings/org.eclipse.jdt.core.prefs index 444e1bcc5..23fa13b17 100644 --- a/org.omg.sysml.xtext/.settings/org.eclipse.jdt.core.prefs +++ b/org.omg.sysml.xtext/.settings/org.eclipse.jdt.core.prefs @@ -1,3 +1,9 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.xtext/META-INF/MANIFEST.MF b/org.omg.sysml.xtext/META-INF/MANIFEST.MF index f07f7fd99..7bccdff38 100644 --- a/org.omg.sysml.xtext/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext/META-INF/MANIFEST.MF @@ -2,8 +2,9 @@ Manifest-Version: 1.0 Automatic-Module-Name: org.omg.sysml.xtext Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xtext +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.49.0.qualifier +Bundle-Version: 0.50.0.qualifier Bundle-SymbolicName: org.omg.sysml.xtext; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, diff --git a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/InternalParserSplitterFragment.java b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/InternalParserSplitterFragment.java index 93f165bf3..0a81cff22 100644 --- a/org.omg.sysml.xtext/src/org/omg/sysml/xtext/InternalParserSplitterFragment.java +++ b/org.omg.sysml.xtext/src/org/omg/sysml/xtext/InternalParserSplitterFragment.java @@ -24,6 +24,7 @@ package org.omg.sysml.xtext; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -33,8 +34,6 @@ import org.apache.log4j.Logger; import org.eclipse.xtext.xtext.generator.AbstractXtextGeneratorFragment; -import com.google.common.base.Charsets; - public class InternalParserSplitterFragment extends AbstractXtextGeneratorFragment { private final static Logger LOGGER = Logger.getLogger(InternalParserSplitterFragment.class); @@ -162,7 +161,7 @@ public void readInput() { String inputPath = inputDirectory + "/" + originalClassName + ".java"; LOGGER.info("Reading " + inputPath); try { - content = Files.readString(Paths.get(inputPath), Charsets.UTF_8); + content = Files.readString(Paths.get(inputPath), StandardCharsets.UTF_8); } catch (Exception e) { LOGGER.error(e); } @@ -178,7 +177,7 @@ protected void writeOutput(String fileName, String output) throws IOException { LOGGER.info("Writing " + outputPath); Path outputFile = Paths.get(outputPath); try { - Files.writeString(outputFile, output, Charsets.UTF_8); + Files.writeString(outputFile, output, StandardCharsets.UTF_8); } catch (Exception e) { LOGGER.error(e); throw e; diff --git a/org.omg.sysml/.classpath b/org.omg.sysml/.classpath index 6af18b23b..75cf2b6f8 100644 --- a/org.omg.sysml/.classpath +++ b/org.omg.sysml/.classpath @@ -1,6 +1,6 @@ - + diff --git a/org.omg.sysml/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +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.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml/META-INF/MANIFEST.MF b/org.omg.sysml/META-INF/MANIFEST.MF index 873be9352..6d7ef9579 100644 --- a/org.omg.sysml/META-INF/MANIFEST.MF +++ b/org.omg.sysml/META-INF/MANIFEST.MF @@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Version: 0.49.0.qualifier +Bundle-RequiredExecutionEnvironment: JavaSE-21 +Bundle-Version: 0.50.0.qualifier Bundle-ClassPath: ., lib/sysml-v2-api-client-all.jar Bundle-SymbolicName: org.omg.sysml;singleton:=true diff --git a/org.omg.sysml/model/KerML.genmodel b/org.omg.sysml/model/KerML.genmodel index 21cfc733b..7f4dfbeed 100644 --- a/org.omg.sysml/model/KerML.genmodel +++ b/org.omg.sysml/model/KerML.genmodel @@ -3,7 +3,7 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.omg.sysml/syntax-gen" modelPluginID="org.omg.sysml" modelName="KerML" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="5.0" copyrightFields="false" + importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="21.0" copyrightFields="false" usedGenPackages="../../org.eclipse.uml2.types/model/Types.genmodel#//types">
diff --git a/org.omg.sysml/model/SysML.genmodel b/org.omg.sysml/model/SysML.genmodel index eb4e649fb..25675ec6e 100644 --- a/org.omg.sysml/model/SysML.genmodel +++ b/org.omg.sysml/model/SysML.genmodel @@ -3,7 +3,7 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.omg.sysml/syntax-gen" modelPluginID="org.omg.sysml" modelName="SysML" modelPluginClass="" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="8.0" copyrightFields="false" + importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="21.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
@@ -1315,10 +1315,10 @@ + - - + diff --git a/org.omg.sysml/model/SysML_.genmodel b/org.omg.sysml/model/SysML_.genmodel index c7fd9f1ba..5aa679ece 100644 --- a/org.omg.sysml/model/SysML_.genmodel +++ b/org.omg.sysml/model/SysML_.genmodel @@ -2,7 +2,7 @@
@@ -64,6 +64,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -85,6 +158,10 @@ + + + + @@ -127,6 +204,7 @@ + @@ -161,13 +239,17 @@ - + + + + - + + @@ -184,73 +266,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - @@ -258,7 +282,6 @@ - @@ -269,17 +292,19 @@ - - + + + + + + + - - - @@ -291,6 +316,21 @@ + + + + + + + + + + + + + + + @@ -324,6 +364,10 @@ + + + + @@ -347,30 +391,52 @@ - - + + + + - - - - + + + + + + + - - - - - - - - - - + + + - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -386,112 +452,225 @@ - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - @@ -500,19 +679,48 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -521,6 +729,8 @@ + + @@ -528,38 +738,38 @@ - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -577,57 +787,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -636,34 +801,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -671,66 +808,46 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + @@ -744,18 +861,11 @@ - - - + + - - - - - - - - + + @@ -766,7 +876,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -774,134 +912,61 @@ - - - - - - - - - - + + + + + - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + + - - + + + - - - - - - - - - - - + + + + - - + diff --git a/org.omg.sysml/model/SysML_clean.genmodel b/org.omg.sysml/model/SysML_clean.genmodel index 283d3137e..60b66add7 100644 --- a/org.omg.sysml/model/SysML_clean.genmodel +++ b/org.omg.sysml/model/SysML_clean.genmodel @@ -3,7 +3,7 @@ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel" modelDirectory="/org.omg.sysml/src" modelPluginID="org.omg.sysml" modelName="SysML_clean" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" - importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="17.0" copyrightFields="false" + importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="21.0" copyrightFields="false" usedGenPackages="../../org.eclipse.uml2.types/model/Types.genmodel#//types" operationReflection="true" importOrganizing="true"> diff --git a/pom.xml b/pom.xml index d77693dc4..b6221f264 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - 0.49.0-SNAPSHOT - 4.0.7 + 0.50.0-SNAPSHOT + 4.0.13 UTF-8 3.1.0 1.6.0 @@ -21,12 +21,13 @@ 1.12.0 16.20.2 1.22.19 - 17 - 17 - 2.34.0 - 3.0.0-M7 - 2.2.2 - 1.6.0 + 21 + ${java.version} + ${java.version} + 2.38.0 + 3.5.3 + 3.2.0 + 2.3.19 4.0.0 @@ -116,7 +117,7 @@ target-platform-configuration ${tycho-version} - JavaSE-17 + JavaSE-${java.version} org.omg.sysml @@ -266,7 +267,9 @@ --> . - **/** + + **/** + diff --git a/sysml/src/training/13. Flows/Flow Definition Example.sysml b/sysml/src/training/13. Flows/Flow Definition Example.sysml index e8ee0efd8..e531c4108 100644 --- a/sysml/src/training/13. Flows/Flow Definition Example.sysml +++ b/sysml/src/training/13. Flows/Flow Definition Example.sysml @@ -1,4 +1,4 @@ -package 'Flow Connection Definition Example' { +package 'Flow Definition Example' { private import 'Port Example'::*; part def Vehicle; diff --git a/sysml/src/training/13. Flows/Flow Interface Example.sysml b/sysml/src/training/13. Flows/Flow Interface Example.sysml index 6ae161232..4318fcf1d 100644 --- a/sysml/src/training/13. Flows/Flow Interface Example.sysml +++ b/sysml/src/training/13. Flows/Flow Interface Example.sysml @@ -1,4 +1,4 @@ -package 'Flow Connection Interface Example' { +package 'Flow Interface Example' { private import 'Port Example'::*; part def Vehicle; diff --git a/sysml/src/training/13. Flows/Flow Connection Usage Example.sysml b/sysml/src/training/13. Flows/Flow Usage Example.sysml similarity index 88% rename from sysml/src/training/13. Flows/Flow Connection Usage Example.sysml rename to sysml/src/training/13. Flows/Flow Usage Example.sysml index 4848ffd0c..8959cf698 100644 --- a/sysml/src/training/13. Flows/Flow Connection Usage Example.sysml +++ b/sysml/src/training/13. Flows/Flow Usage Example.sysml @@ -1,4 +1,4 @@ -package 'Flow Connection Interface Example' { +package 'Flow Usage Example' { private import 'Port Example'::*; part def Vehicle;