Skip to content

Commit bf5d72a

Browse files
authored
Merge pull request #655 from Systems-Modeling/ST6RI-844
ST6RI-844 Update to Eclipse 2025-03
2 parents 3274c7c + 3ffba41 commit bf5d72a

File tree

109 files changed

+931
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+931
-655
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v4
24-
- name: Set up JDK 17
24+
- name: Set up JDK 21
2525
uses: actions/setup-java@v4
2626
with:
27-
java-version: '17'
27+
java-version: '21'
2828
distribution: 'temurin'
2929
cache: maven
3030
- name: Build with Maven

.github/workflows/maven-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
- name: Set up JDK 17
22+
- name: Set up JDK 21
2323
uses: actions/setup-java@v4
2424
with:
25-
java-version: '17'
25+
java-version: '21'
2626
distribution: 'temurin'
2727
cache: maven
2828
- name: Remove -snapshot from version

README.adoc

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ The project provides a configuration file for the https://wiki.eclipse.org/Eclip
1919
+
2020
image:installer-advanced.png[switch to advanced mode]
2121

22-
4. In the product list, select "Eclipse Modeling Tools" with Product Version: 2024-03.
22+
4. In the Products window, select "Eclipse Modeling Tools" with:
23+
* Product Version: 2025-03
24+
* Java VM: Java 21
2325

24-
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.
26+
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.
2527
* e.g. `file:/C:/git/sysml/SysML-v2-Pilot-Implementation/org.omg.sysml.installer/SysML2.setup`
2628
* **Note:** If you have installed the SysML v2 Pilot Implementation previously, this may already be pre-selected.
2729

@@ -30,9 +32,9 @@ image:installer-advanced.png[switch to advanced mode]
3032
image:oomph-projects.png[oomph projects]
3133

3234
7. On the next page, update the following variables, then press Next.
33-
* Git clone location rule: Select "Located in specific absolute folder location" and browse to the directory for the SysML git repository.
34-
* Root install folder: Change this if you wish the installation to be under a specific folder.
35-
* Workspace location rule: Change this if you wish to place the workspace at a specific location.
35+
* Installation folder name: Change this if you wish the installation to be under a specific folder.
36+
* Workspace folder name: Change this if you wish to place the workspace at a specific location.
37+
* Git clone location: Browse to the directory for the SysML git repository.
3638

3739
8. On the Confirmation page, press Finish.
3840

@@ -42,12 +44,12 @@ image:oomph-projects.png[oomph projects]
4244

4345
==== Manual installation
4446

45-
1. Install Eclipse 2024-03 (4.25) and Xtext.
47+
1. Install Eclipse 2025-03 (4.35) and Xtext.
4648
* Install the “Eclipse Modeling Tools” package.
47-
** `https://www.eclipse.org/downloads/packages/release/2024-03/r/eclipse-modeling-tools`
49+
** `https://www.eclipse.org/downloads/packages/release/2025-03/r/eclipse-modeling-tools`
4850

4951
* To install Xtext, select Help > Install New Software, use the update site URL given below, and install “Xtext Complete SDK” (under General Purpose Tools).
50-
** `http://download.eclipse.org/releases/2024-03`
52+
** `http://download.eclipse.org/releases/2025-03`
5153

5254
* (Optional) For PlantUML visualization, you need to install PlantUML-Eclipse with SysMLv2 extensions from
5355
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]
6769
* `org.sysml.xtext.ide`
6870
* `org.sysml.xtext.ui`
6971

70-
**Note:**
71-
72-
* https://gradle.org/[Gradle] is used to build project `org.omg.sysml.jupyter`.
73-
* 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`).
72+
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`).
7473
* To build the repository, invoke `mvn clean package` from the base `SysML-v2-Pilot-Implementation` directory.
7574
* 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`.
7675

7776
=== Prototype SysML Implementation
7877

7978
==== Getting Started
80-
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`.
81-
82-
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.
79+
1. Right click on project `org.omg.sysml`, and select Run As > Eclipse Application. This should launch a new runtime Eclipse instance.
8380

8481
3. Add the SysML-v2-Pilot-Implementation Git repository (already cloned previously) to the runtime Eclipse instance.
8582

@@ -138,7 +135,7 @@ Set up a Java code template as follows:
138135
----
139136
/**
140137
* SysML 2 Pilot Implementation
141-
* Copyright (C) 2020 California Institute of Technology ("Caltech")
138+
* Copyright (C) 2025 <Your organization name>
142139
*
143140
* This program is free software: you can redistribute it and/or modify
144141
* 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:
161158

162159
=== For existing code
163160
* When modifying existing code created by someone in a different organization, add a new copyright line, without changing anything else in the header.
164-
* 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".)
161+
* 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".)
165162

166163
=== Sources
167164
* https://www.gnu.org/licenses/gpl-3.0.en.html[GNU GPL v3.0 - How to Apply These Terms to Your New Programs]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="src" path="src-gen"/>
55
<classpathentry kind="src" path="xtend-gen"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
6+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
77
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
88
<classpathentry kind="output" path="target/classes"/>
99
</classpath>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4-
org.eclipse.jdt.core.compiler.compliance=17
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
4+
org.eclipse.jdt.core.compiler.compliance=21
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
77
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
88
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
99
org.eclipse.jdt.core.compiler.release=enabled
10-
org.eclipse.jdt.core.compiler.source=17
10+
org.eclipse.jdt.core.compiler.source=21

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
22
Automatic-Module-Name: org.omg.kerml.expressions.xtext.ide
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ide
5+
Bundle-RequiredExecutionEnvironment: JavaSE-21
56
Bundle-Vendor: SysML v2 Submission Team
6-
Bundle-Version: 0.49.0.qualifier
7+
Bundle-Version: 0.50.0.qualifier
78
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
89
Bundle-ActivationPolicy: lazy
910
Require-Bundle: org.omg.kerml.expressions.xtext,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="src" path="src-gen"/>
55
<classpathentry kind="src" path="xtend-gen"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
6+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
77
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
88
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
99
<classpathentry kind="output" path="target/classes"/>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
4-
org.eclipse.jdt.core.compiler.compliance=17
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
4+
org.eclipse.jdt.core.compiler.compliance=21
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
77
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
88
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
99
org.eclipse.jdt.core.compiler.release=enabled
10-
org.eclipse.jdt.core.compiler.source=17
10+
org.eclipse.jdt.core.compiler.source=21

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ Manifest-Version: 1.0
22
Automatic-Module-Name: org.omg.kerml.expressions.xtext.ui
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ui
5+
Bundle-RequiredExecutionEnvironment: JavaSE-21
56
Bundle-Vendor: SysML v2 Submission Team
6-
Bundle-Version: 0.49.0.qualifier
7+
Bundle-Version: 0.50.0.qualifier
78
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
89
Bundle-ActivationPolicy: lazy
910
Require-Bundle: org.omg.kerml.expressions.xtext,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<classpathentry kind="src" path="src"/>
44
<classpathentry kind="src" path="src-gen"/>
55
<classpathentry kind="src" path="xtend-gen"/>
6-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
6+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
77
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
88
<classpathentry combineaccessrules="false" kind="src" path="/org.omg.sysml"/>
99
<classpathentry kind="output" path="target/classes"/>

0 commit comments

Comments
 (0)