TNO · Yuri-Blankenstein-TNO · Sep 11, 2025 · Aug 5, 2025 · Aug 5, 2025 · Aug 5, 2025
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
@@ -30,21 +30,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11 for x64
-      uses: actions/setup-java@v3
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Maven Action
+      uses: s4u/setup-maven-action@v1.18.0
       with:
-        java-version: '11'
-        distribution: 'temurin'
-        architecture: x64
-        cache: maven
-    - name: Build with Maven
+        java-version: 21
+        java-distribution: temurin
+    - name: Build and Test with Maven
       run: mvn verify --batch-mode --update-snapshots --fail-at-end --file pom.xml -Dpps.version.qualifier=$(./versionQualifier.sh)
     - name: Attach Test Report
       if: success() || failure()
       uses: scacap/action-surefire-report@v1
     - name: Attach Website
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: PPS-website
         path: releng/nl.esi.pps.website/target/website

diff --git a/.github/workflows/build_tag.yml b/.github/workflows/build_tag.yml
@@ -27,24 +27,23 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-
+    env:
+      MAVEN_OPTS: --add-opens java.base/java.lang=ALL-UNNAMED
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11 for x64
-      uses: actions/setup-java@v3
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Setup Maven Action
+      uses: s4u/setup-maven-action@v1.18.0
       with:
-        java-version: '11'
-        distribution: 'temurin'
-        architecture: x64
-        cache: maven
-    - name: Build with Maven
+        java-version: 21
+        java-distribution: temurin
+    - name: Build and Test with Maven
       run: mvn verify --batch-mode --update-snapshots --fail-at-end --file pom.xml -Dpps.version.enduser=$GITHUB_REF_NAME -Dpps.version.qualifier=$(./versionQualifier.sh $GITHUB_REF_NAME)
     - name: Attach Test Report
       if: success() || failure()
       uses: scacap/action-surefire-report@v1
     - name: Release PPS
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
+      uses: softprops/action-gh-release@v2
       with:
         files: |
           products/nl.esi.pps.product/target/products/pps-*.zip

diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,23 @@
+# Maven build folder
+**/bin/
+**/target/
+
+# Maven Tycho pomless files
+**/.polyglot.*
+**/.META-INF_MANIFEST.MF
+**/feature.xml.takari_issue_192
+**/pom.tycho
+
+# Generation and merging artifacts
+**/xtend-gen/**/*.xtendbin
+**/xtend-gen/**/*._trace
+**/src-gen/**/*._trace
+**/plugin.xml_gen
+**/*.orig
+
 /.classpath
 /.metadata/
 /.settings/
 /workspace
 /**/.JETEmitters
-/**/bin/
-/**/target/
-/**/xtend-gen/**/*.xtendbin
-/**/xtend-gen/**/*._trace
-/**/plugin.xml_gen
-/**/*.orig
 /**/.asciidoctor/
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+    Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 
     This program and the accompanying materials are made available
     under the terms of the MIT License which is available at
@@ -12,8 +12,8 @@
 -->
 <extensions>
     <extension>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-pomless</artifactId>
-        <version>2.6.0</version>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-build</artifactId>
+        <version>4.0.13</version>
     </extension>
 </extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1 @@
+-Djava-21
diff --git a/README.md b/README.md
@@ -43,10 +43,10 @@ To create a development environment:
       If the button is disabled (grey), you are already using the latest version.
 - In the first wizard window:
     - Select **Eclipse IDE for Eclipse Comitters** from the big list at the top.
-    - Select **2021-12** for **Product Version**.
-    - For **Java 11+ VM** select either a JRE 11 that is installed on your local machine or the JustJ JRE 11 release.
+    - Select **2024-09** for **Product Version**.
+    - For **Java 21+ VM** select either a JRE 21 that is installed on your local machine or the JustJ JRE 21 release.
       Use the button to the right of the dropdown to manage the installed virtual machines on your system.
-      A JDK can also be downloaded from e.g. [Oracle](https://www.oracle.com/java/technologies/javase/jdk11-archive-downloads.html) or [Adoptium](https://adoptium.net/temurin/archive/?variant=openjdk11&jvmVariant=hotspot&version=11).
+      A JDK can also be downloaded from e.g. [Adoptium](https://adoptium.net/temurin/releases?version=21&os=any&arch=any).
     - Choose whether you want a P2 bundle pool (recommended).
     - Click the **Next** button.
 - In the second wizard window:

diff --git a/features/nl.esi.pps.common.emf.feature/build.properties b/features/nl.esi.pps.common.emf.feature/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 #
 # This program and the accompanying materials are made available
 # under the terms of the MIT License which is available at

diff --git a/features/nl.esi.pps.common.emf.feature/feature.xml b/features/nl.esi.pps.common.emf.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+    Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 
     This program and the accompanying materials are made available
     under the terms of the MIT License which is available at
@@ -13,7 +13,7 @@
 <feature
       id="nl.esi.pps.common.emf.feature"
       label="PPS Common EMF Utilities Feature"
-      version="0.20.0.qualifier"
+      version="0.30.0.qualifier"
       provider-name="ESI (TNO)"
       license-feature="nl.esi.pps.license"
       license-feature-version="0.0.0">
@@ -32,7 +32,7 @@
 
    <requires>
       <import feature="org.eclipse.emf.ecore" version="2.10" match="greaterOrEqual"/>
-      <import feature="nl.esi.pps.common.ui.feature" version="0.20.0" match="equivalent"/>
+      <import feature="nl.esi.pps.common.ui.feature" version="0.30.0" match="equivalent"/>
       <import feature="org.eclipse.trace4cps.common.jfreechart.feature" version="0.2.0.qualifier" match="greaterOrEqual"/>
    </requires>
 

diff --git a/features/nl.esi.pps.common.ui.feature/build.properties b/features/nl.esi.pps.common.ui.feature/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 #
 # This program and the accompanying materials are made available
 # under the terms of the MIT License which is available at

diff --git a/features/nl.esi.pps.common.ui.feature/feature.xml b/features/nl.esi.pps.common.ui.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+    Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 
     This program and the accompanying materials are made available
     under the terms of the MIT License which is available at
@@ -13,7 +13,7 @@
 <feature
       id="nl.esi.pps.common.ui.feature"
       label="PPS Common UI Feature"
-      version="0.20.0.qualifier"
+      version="0.30.0.qualifier"
       provider-name="ESI (TNO)"
       license-feature="nl.esi.pps.license"
       license-feature-version="0.0.0">

diff --git a/features/nl.esi.pps.tmsc.feature/.settings/org.eclipse.core.resources.prefs b/features/nl.esi.pps.tmsc.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/nl.esi.pps.tmsc.feature/build.properties b/features/nl.esi.pps.tmsc.feature/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 #
 # This program and the accompanying materials are made available
 # under the terms of the MIT License which is available at

diff --git a/features/nl.esi.pps.tmsc.feature/feature.xml b/features/nl.esi.pps.tmsc.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+    Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 
     This program and the accompanying materials are made available
     under the terms of the MIT License which is available at
@@ -13,7 +13,7 @@
 <feature
       id="nl.esi.pps.tmsc.feature"
       label="TMSC Feature"
-      version="0.20.0.qualifier"
+      version="0.30.0.qualifier"
       provider-name="ESI (TNO)"
       license-feature="nl.esi.pps.license"
       license-feature-version="0.0.0">
@@ -31,7 +31,7 @@
    </license>
 
    <requires>
-      <import feature="nl.esi.pps.common.emf.feature" version="0.20.0" match="equivalent"/>
+      <import feature="nl.esi.pps.common.emf.feature" version="0.30.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/features/nl.esi.pps.tmsc.ui.feature/.settings/org.eclipse.core.resources.prefs b/features/nl.esi.pps.tmsc.ui.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/features/nl.esi.pps.tmsc.ui.feature/build.properties b/features/nl.esi.pps.tmsc.ui.feature/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 #
 # This program and the accompanying materials are made available
 # under the terms of the MIT License which is available at

diff --git a/features/nl.esi.pps.tmsc.ui.feature/feature.xml b/features/nl.esi.pps.tmsc.ui.feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+    Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 
     This program and the accompanying materials are made available
     under the terms of the MIT License which is available at
@@ -13,7 +13,7 @@
 <feature
       id="nl.esi.pps.tmsc.ui.feature"
       label="TMSC UI Feature"
-      version="0.20.0.qualifier"
+      version="0.30.0.qualifier"
       provider-name="ESI (TNO)"
       license-feature="nl.esi.pps.license"
       license-feature-version="0.0.0">
@@ -37,7 +37,7 @@
    <requires>
       <import feature="net.sourceforge.plantuml.feature" version="1.1.26" match="greaterOrEqual"/>
       <import feature="org.eclipse.trace4cps.common.jfreechart.feature" version="0.2.0.qualifier" match="greaterOrEqual"/>
-      <import feature="nl.esi.pps.common.emf.feature" version="0.20.0" match="equivalent"/>
+      <import feature="nl.esi.pps.common.emf.feature" version="0.30.0" match="equivalent"/>
    </requires>
 
    <plugin

diff --git a/plugins/nl.esi.emf.ecore.transformations/.settings/org.eclipse.core.resources.prefs b/plugins/nl.esi.emf.ecore.transformations/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/nl.esi.emf.ecore.transformations/transforms/ReadOnlyGeneratorModel.qvto b/plugins/nl.esi.emf.ecore.transformations/transforms/ReadOnlyGeneratorModel.qvto
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+ * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
  *
  * This program and the accompanying materials are made available
  * under the terms of the MIT License which is available at

diff --git a/plugins/nl.esi.emf.properties.edit/.classpath b/plugins/nl.esi.emf.properties.edit/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<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="src-gen/"/>
 	<classpathentry kind="src" path="src"/>

diff --git a/plugins/nl.esi.emf.properties.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/nl.esi.emf.properties.edit/.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=11
-org.eclipse.jdt.core.compiler.compliance=11
+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=11
+org.eclipse.jdt.core.compiler.source=21
diff --git a/plugins/nl.esi.emf.properties.edit/META-INF/MANIFEST.MF b/plugins/nl.esi.emf.properties.edit/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: nl.esi.emf.properties.edit;singleton:=true
 Automatic-Module-Name: nl.esi.emf.properties.edit
-Bundle-Version: 0.20.0.qualifier
+Bundle-Version: 0.30.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: nl.esi.emf.properties.provider.PropertiesEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: nl.esi.emf.edit.provider,
  nl.esi.emf.properties.edit;x-internal:=true,
  nl.esi.emf.properties.provider

diff --git a/plugins/nl.esi.emf.properties.edit/build.properties b/plugins/nl.esi.emf.properties.edit/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 #
 # This program and the accompanying materials are made available
 # under the terms of the MIT License which is available at

diff --git a/plugins/nl.esi.emf.properties.edit/plugin.properties b/plugins/nl.esi.emf.properties.edit/plugin.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 #
 # This program and the accompanying materials are made available
 # under the terms of the MIT License which is available at

diff --git a/plugins/nl.esi.emf.properties.edit/plugin.xml b/plugins/nl.esi.emf.properties.edit/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+    Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 
     This program and the accompanying materials are made available
     under the terms of the MIT License which is available at

diff --git a/plugins/nl.esi.emf.properties.edit/src/nl/esi/emf/edit/provider/EMFEditUtil.java b/plugins/nl.esi.emf.properties.edit/src/nl/esi/emf/edit/provider/EMFEditUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+ * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
  *
  * This program and the accompanying materials are made available
  * under the terms of the MIT License which is available at

diff --git a/...si.emf.properties.edit/src/nl/esi/emf/properties/edit/PropertyItemPropertyDescriptor.java b/...si.emf.properties.edit/src/nl/esi/emf/properties/edit/PropertyItemPropertyDescriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+ * Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
  *
  * This program and the accompanying materials are made available
  * under the terms of the MIT License which is available at

diff --git a/plugins/nl.esi.emf.properties/.classpath b/plugins/nl.esi.emf.properties/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<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="src-gen"/>
 	<classpathentry kind="src" path="src"/>

diff --git a/plugins/nl.esi.emf.properties/.settings/org.eclipse.core.resources.prefs b/plugins/nl.esi.emf.properties/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/nl.esi.emf.properties/.settings/org.eclipse.jdt.core.prefs b/plugins/nl.esi.emf.properties/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+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=11
+org.eclipse.jdt.core.compiler.source=21
diff --git a/plugins/nl.esi.emf.properties/META-INF/MANIFEST.MF b/plugins/nl.esi.emf.properties/META-INF/MANIFEST.MF
@@ -3,11 +3,11 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: nl.esi.emf.properties;singleton:=true
 Automatic-Module-Name: nl.esi.emf.properties
-Bundle-Version: 0.20.0.qualifier
+Bundle-Version: 0.30.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Export-Package: nl.esi.emf.properties,
  nl.esi.emf.properties.impl,
  nl.esi.emf.properties.util,

diff --git a/plugins/nl.esi.emf.properties/build.properties b/plugins/nl.esi.emf.properties/build.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018-2023 TNO and Contributors to the GitHub community
+# Copyright (c) 2018-2025 TNO and Contributors to the GitHub community
 #
 # This program and the accompanying materials are made available
 # under the terms of the MIT License which is available at
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8