Merge pull request #135 from kieler/nre/master

Updated platform dependencies to latest releases

Author: a-sr

.github/workflows/ci.yml

@@ -30,10 +30,10 @@ jobs:
           path: models
 
       # Provide Java
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       # Configure maven artifact caching
@@ -238,10 +238,10 @@ jobs:
     steps:
       # Setup
       - 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: 'adopt'
 
       - name: Cache local Maven repository
@@ -266,10 +266,10 @@ jobs:
     steps:
       # Setup
       - 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: 'adopt'
 
       - name: Cache local Maven repository

build/de.cau.cs.kieler.semantics.repository/category.xml

@@ -36,8 +36,8 @@
   <repository-reference location="https://download.eclipse.org/releases/2023-06" enabled="true"/>
   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0" enabled="true"/>
   <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/" enabled="true"/>
-  <repository-reference location="https://kieler.github.io/KLighD/v3.0.1/" enabled="true"/>
-  <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2024-04" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" enabled="true"/>
+  <repository-reference location="https://kieler.github.io/KLighD/v3.1.0/" enabled="true"/>
+  <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2025-04" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.10.0/" enabled="true"/>
   <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/" enabled="true"/>
 </site>

build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target

@@ -10,7 +10,9 @@
       <unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2024-09"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2024-12"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <!-- Required for JUnit4 Tests to be able to run -->
@@ -21,12 +23,7 @@
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="com.google.gson" version="0.0.0"/>
       <unit id="org.freemarker.freemarker" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.34.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.klighd.feature.feature.group" version="0.0.0"/>
@@ -36,17 +33,17 @@
       <unit id="de.cau.cs.kieler.klighd.standalone" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.klighd.ui.contrib3x" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.kgraph.text.ui" version="0.0.0"/>
-      <repository location="https://kieler.github.io/KLighD/v3.0.1/"/>
+      <repository location="https://kieler.github.io/KLighD/v3.1.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.graphs.klighd" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2024-04"/>
+      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2025-04"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
+      <repository location="https://download.eclipse.org/elk/updates/releases/0.10.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.websocket.mirror" version="0.0.0"/>

build/pom.xml

@@ -10,23 +10,23 @@
   <!-- Define a few properties used throughout all build profiles. -->
   <properties>
     <!-- Language server dependency versions -->
-    <elk-version>0.9.1</elk-version>
-    <klighd-version>3.0.2.v20240507</klighd-version>
-    <lsp4j-version>0.23.0</lsp4j-version>
-    <pragmatics-version>0.51.0.v20240410</pragmatics-version>
+    <elk-version>0.10.0</elk-version>
+    <klighd-version>3.1.0.v20250428</klighd-version>
+    <lsp4j-version>0.23.1</lsp4j-version>
+    <pragmatics-version>0.52.0.v20250429</pragmatics-version>
 
     <!-- Xtext compile dependency versions -->
-    <xtend-version>2.36.0</xtend-version>
-    <xtext-version>2.36.0</xtext-version>
+    <xtend-version>2.37.0</xtend-version>
+    <xtext-version>2.37.0</xtext-version>
 
     <!-- Tycho -->
-    <tycho-version>2.7.5</tycho-version>
+    <tycho-version>4.0.12</tycho-version>
     <tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>
 
     <!-- Java -->
-    <targetJdk>11</targetJdk>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <targetJdk>21</targetJdk>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
 
     <!-- Non-breakable space, as normal spaces are trimmed. -->
     <sourceFeatureLabelSuffix>&#xA0;(Sources)</sourceFeatureLabelSuffix>

features/de.cau.cs.kieler.esterel.feature/pom.xml

@@ -15,15 +15,15 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
         <version>${tycho-version}</version>
         <executions>
           <execution>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <phase>package</phase>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <excludes>

features/de.cau.cs.kieler.framework.feature/pom.xml

@@ -15,15 +15,15 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
         <version>${tycho-version}</version>
         <executions>
           <execution>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <phase>package</phase>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <labelSuffix>${sourceFeatureLabelSuffix}</labelSuffix>

features/de.cau.cs.kieler.sccharts.feature/pom.xml

@@ -15,15 +15,15 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
         <version>${tycho-version}</version>
         <executions>
           <execution>
-            <id>source-feature</id>
+            <id>feature-source</id>
             <phase>package</phase>
             <goals>
-              <goal>source-feature</goal>
+              <goal>feature-source</goal>
             </goals>
             <configuration>
               <labelSuffix>${sourceFeatureLabelSuffix}</labelSuffix>

language-server/de.cau.cs.kieler.language.server/.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">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

language-server/de.cau.cs.kieler.language.server/.settings/org.eclipse.jdt.core.prefs

@@ -1,10 +1,10 @@
 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.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=21

language-server/de.cau.cs.kieler.language.server/pom.xml

@@ -140,12 +140,12 @@
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
-      <version>3.31.100</version>
+      <version>3.32.0</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.platform</groupId>
       <artifactId>org.eclipse.equinox.common</artifactId>
-      <version>3.19.100</version>
+      <version>3.19.200</version>
     </dependency>
 
     <!-- Additional dependencies that the downstream Eclipse bundles do not list as Maven dependencies. -->
@@ -160,7 +160,7 @@
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>org.eclipse.jdt.core</artifactId>
-      <version>3.39.0</version>
+      <version>3.40.0</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
     <!-- <dependency>