Merge pull request #122 from kieler/als/targetplatform

Upgrade to Eclipse 2024-09 Target Platform
kieler · Oct 22, 2024 · 3dd8e03 · 3dd8e03
2 parents b181d9c + 6ed1faf
commit 3dd8e03
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/...e.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target b/...e.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target
@@ -10,7 +10,7 @@
       <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-03"/>
+      <repository location="https://download.eclipse.org/releases/2024-09"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <!-- Required for JUnit4 Tests to be able to run -->
@@ -21,12 +21,12 @@
     <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.31.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.34.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.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"/>

diff --git a/build/pom.xml b/build/pom.xml
@@ -12,12 +12,12 @@
     <!-- Language server dependency versions -->
     <elk-version>0.9.1</elk-version>
     <klighd-version>3.0.2.v20240507</klighd-version>
-    <lsp4j-version>0.22.0</lsp4j-version>
+    <lsp4j-version>0.23.0</lsp4j-version>
     <pragmatics-version>0.51.0.v20240410</pragmatics-version>
 
     <!-- Xtext compile dependency versions -->
-    <xtend-version>2.34.0</xtend-version>
-    <xtext-version>2.34.0</xtext-version>
+    <xtend-version>2.36.0</xtend-version>
+    <xtext-version>2.36.0</xtext-version>
 
     <!-- Tycho -->
     <tycho-version>2.7.5</tycho-version>

diff --git a/build/scripts/uberjar.py b/build/scripts/uberjar.py
@@ -73,6 +73,7 @@
     'META-INF/NOTICE',
     'META-INF/p2.inf',
     'META-INF/versions/*/module-info.class',
+    'META-INF/versions/*/OSGI-INF/MANIFEST.MF',
     'OSGI-INF/l10n/bundle.properties',
     'OSGI-INF/repositoryManager.xml',
     'docs/*',

diff --git a/language-server/de.cau.cs.kieler.language.server/pom.xml b/language-server/de.cau.cs.kieler.language.server/pom.xml
@@ -135,6 +135,19 @@
       <version>${lsp4j-version}</version>
     </dependency>
 
+
+    <!-- Somehow important -->
+    <dependency>
+      <groupId>org.eclipse.platform</groupId>
+      <artifactId>org.eclipse.core.runtime</artifactId>
+      <version>3.31.100</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.platform</groupId>
+      <artifactId>org.eclipse.equinox.common</artifactId>
+      <version>3.19.100</version>
+    </dependency>
+
     <!-- Additional dependencies that the downstream Eclipse bundles do not list as Maven dependencies. -->
 
     <!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
@@ -147,7 +160,7 @@
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>org.eclipse.jdt.core</artifactId>
-      <version>3.30.0</version>
+      <version>3.39.0</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
     <!-- <dependency>

diff --git a/oomph/kieler-semantics-developers.setup b/oomph/kieler-semantics-developers.setup
@@ -463,7 +463,7 @@
             versionRange="2.7.0"/>
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"
-            versionRange="[2.34.0,2.35.0)"/>
+            versionRange="[2.36.0,2.37.0)"/>
         <requirement
             name="org.eclipse.emf.mwe2.launcher.feature.group"/>
         <requirement
@@ -519,11 +519,11 @@
         <repositoryList
             name="FixedTarget">
           <repository
-              url="https://download.eclipse.org/releases/2024-03"/>
+              url="https://download.eclipse.org/releases/2024-09"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
+              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0"/>
           <repository
-              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
+              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
           <repository
               url="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
           <repository
@@ -539,7 +539,7 @@
         xsi:type="setup.p2:P2Task">
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.34.0,2.35.0)"/>
+          versionRange="[2.36.0,2.37.0)"/>
       <repository
           url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
     </setupTask>