Merge pull request #65 from soerendomroes/sdo/updateTargetPlatformAli…

…ttleMore Update the target platform to 2024-03, Xtext 2.34, Klighd 3.0.1, and ELK 0.9.1
lf-lang · Apr 26, 2024 · a0fbe29 · a0fbe29
2 parents ba6fca9 + c22b563
commit a0fbe29
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 68 deletions.
diff --git a/.github/workflows/eclipse-tests.yml b/.github/workflows/eclipse-tests.yml
@@ -31,5 +31,5 @@ jobs:
         with:
           python-version: '3.10'
       - name: Run Eclipse tests
-        run: mvn -B -U -P test integration-test
+        run: mvn -X -B -U -P test integration-test
         shell: bash
diff --git a/oomph/LinguaFrancaEpoch.setup b/oomph/LinguaFrancaEpoch.setup
@@ -12,7 +12,7 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Launching.ecore http://www.eclipse.org/oomph/predicates/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 https://raw.githubusercontent.com/eclipse-oomph/oomph/master/setups/models/SetupWorkingSets.ecore"
     name="lingua.franca.epoch"
     label="Lingua Franca (Epoch)">
   <setupTask
@@ -165,7 +165,7 @@
         name="org.eclipse.tm.terminal.feature.feature.group"/>
     <requirement
         name="org.eclipse.xtext.sdk.feature.group"
-        versionRange="2.31.0"/>
+        versionRange="2.34.0"/>
     <requirement
         name="org.eclipse.m2e.feature.feature.group"/>
     <requirement
@@ -280,17 +280,15 @@
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <requirement
             name="com.google.inject"/>
-        <requirement
-            name="javax.annotation"/>
         <requirement
             name="com.google.guava"
-            versionRange="27.0.0"/>
+            versionRange="33.0.0"/>
         <requirement
             name="org.eclipse.xtext.runtime.feature.group"
-            versionRange="2.31.0"/>
+            versionRange="2.34.0"/>
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"
-            versionRange="2.31.0"/>
+            versionRange="2.34.0"/>
         <requirement
             name="org.eclipse.platform.source.feature.group"/>
         <requirement
@@ -345,21 +343,19 @@
         <repositoryList
             name="DefaultRepositories">
           <repository
-              url="http://download.eclipse.org/releases/2023-06"/>
+              url="http://download.eclipse.org/releases/2024-03"/>
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
           <repository
-              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
+              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
           <repository
-              url="http://download.eclipse.org/elk/updates/releases/0.8.1/"/>
+              url="http://download.eclipse.org/elk/updates/releases/0.9.1/"/>
           <repository
-              url="https://kieler.github.io/KLighD/v2.3.0/"/>
+              url="https://kieler.github.io/KLighD/v3.0.1/"/>
           <repository
               url="https://github.com/fabioz/Pydev/releases/download/pydev_9_0_1/"/>
           <repository
               url="https://download.eclipse.org/wildwebdeveloper/releases/0.13.0/"/>
-          <repository
-              url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
           <repository
               url="https://lf-lang.github.io/epoch-external-dependencies/"/>
           <repository
@@ -429,43 +425,38 @@
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <requirement
             name="com.google.inject"/>
-        <requirement
-            name="javax.annotation"/>
         <requirement
             name="com.google.guava"
-            versionRange="27.0.0"/>
+            versionRange="33.0.0"/>
         <requirement
             name="com.google.gson"
             versionRange="2.7.0"/>
         <requirement
             name="edu.umd.cs.piccolo"/>
         <requirement
             name="org.eclipse.xtext.runtime.feature.group"
-            versionRange="2.31.0"/>
+            versionRange="2.34.0"/>
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"
-            versionRange="2.31.0"/>
+            versionRange="2.34.0"/>
         <requirement
             name="org.eclipse.platform.source.feature.group"/>
         <requirement
             name="org.eclipse.emf.mwe2.launcher.feature.group"/>
         <requirement
             name="org.eclipse.emf.compare.feature.group"/>
         <requirement
-            name="org.eclipse.lsp4j.sdk.feature.group"
-            versionRange="[0.21.0,0.22.0)"/>
-        <requirement
-            name="org.hamcrest.library"/>
+            name="org.eclipse.lsp4j.sdk.feature.group"/>
         <requirement
-            name="org.freemarker"/>
+            name="org.hamcrest.core"
+            versionRange="[1.3.0.v20230809-1000,1.3.0.v20230809-1000]"/>
         <requirement
-            name="org.freemarker.source"/>
+            name="org.hamcrest.library"
+            versionRange="[1.3.0.v20230809-1000,1.3.0.v20230809-1000]"/>
         <requirement
-            name="org.eclipse.jetty.server"
-            versionRange="10.0.0"/>
+            name="org.freemarker.freemarker"/>
         <requirement
-            name="org.eclipse.jetty.servlet"
-            versionRange="10.0.0"/>
+            name="org.freemarker.freemarker.source"/>
         <requirement
             name="de.cau.cs.kieler.websocket.mirror"/>
         <requirement
@@ -485,18 +476,22 @@
             name="org.lflang.epoch.mirror.json"/>
         <requirement
             name="org.lflang.epoch.mirror.kotlin"/>
+        <requirement
+            name="org.lflang.epoch.mirror.jcip"/>
+        <requirement
+            name="com.github.spotbugs.plugin.eclipse.feature.group"/>
         <repositoryList
             name="DefaultRepositories">
           <repository
-              url="http://download.eclipse.org/releases/2023-06"/>
+              url="http://download.eclipse.org/releases/2024-03"/>
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
           <repository
-              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
+              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
           <repository
-              url="http://download.eclipse.org/elk/updates/releases/0.8.1/"/>
+              url="http://download.eclipse.org/elk/updates/releases/0.9.1/"/>
           <repository
-              url="https://kieler.github.io/KLighD/v2.3.0/"/>
+              url="https://kieler.github.io/KLighD/v3.0.1/"/>
           <repository
               url="https://github.com/fabioz/Pydev/releases/download/pydev_9_0_1/"/>
           <repository
@@ -508,7 +503,9 @@
           <repository
               url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/"/>
           <repository
-              url="http://download.eclipse.org/lsp4j/updates/releases/0.21.0"/>
+              url="http://download.eclipse.org/lsp4j/updates/releases/0.22.0"/>
+          <repository
+              url="https://spotbugs.github.io/eclipse/"/>
         </repositoryList>
       </targlet>
     </setupTask>
@@ -736,7 +733,7 @@
           name="org.eclipse.elk.sdk.feature.feature.group"/>
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.31.0,2.32.0)"/>
+          versionRange="[2.33.0,2.34.0)"/>
       <requirement
           name="org.eclipse.emf.mwe.sdk.feature.group"/>
       <requirement
@@ -752,7 +749,7 @@
       <repository
           url="https://download.eclipse.org/mylyn/releases/3.25/"/>
       <repository
-          url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
+          url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
     </setupTask>
   </stream>
   <logicalProjectContainer

diff --git a/org.lflang.targetplatform/org.lflang.targetplatform.target b/org.lflang.targetplatform/org.lflang.targetplatform.target
@@ -4,8 +4,6 @@
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="jakarta.xml.bind" version="0.0.0"/>
-      <unit id="javax.websocket" version="0.0.0"/>
-      <unit id="javax.xml" version="0.0.0"/>
       <unit id="net.i2p.crypto.eddsa" version="0.0.0"/>
       <unit id="org.aopalliance" version="0.0.0"/>
       <unit id="org.apache.sshd.osgi" version="0.0.0"/>
@@ -21,31 +19,33 @@
       <unit id="org.eclipse.platform.doc.isv" version="0.0.0"/>
       <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-      <unit id="javax.xml" version="0.0.0"/>
-      <unit id="jakarta.xml.bind" version="0.0.0"/>
       <unit id="org.eclipse.lsp4e" version="0.0.0"/>
       <unit id="org.eclipse.emf" version="0.0.0"/>
-      <unit id="org.aopalliance" version="0.0.0"/>
-      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
       <unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
       <unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
       <unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
       <unit id="org.antlr.runtime" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2024-03"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
+      <!-- Required for JUnit4 Tests to be able to run -->
+      <!-- Remove when updating to JUnit5 or another solution is found.-->
+      <unit id="javax.annotation" version="0.0.0"/>
       <repository location="https://download.eclipse.org/releases/2023-06"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.xtext.runtime.feature.group" version="0.0.0"/>
+      <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.31.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="com.google.inject" version="0.0.0"/>
-      <unit id="jakarta.activation" version="0.0.0"/>
       <unit id="com.google.gson" version="0.0.0"/>
-      <unit id="javax.activation" version="0.0.0"/>
-      <unit id="javaewah" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.lflang.epoch.mirror.json" version="0.0.0"/>
@@ -70,19 +70,14 @@
       <unit id="de.cau.cs.kieler.klighd.ide.feature.feature.group" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.klighd.view.feature.feature.group" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.klighd.freehep.feature.feature.group" version="0.0.0"/>
-      <unit id="de.cau.cs.kieler.klighd.lsp" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.klighd.ui.contrib3x" version="0.0.0"/>
-      <repository location="https://kieler.github.io/KLighD/v2.3.0/"/>
-    </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <unit id="org.eclipse.sprotty" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
+      <repository location="https://kieler.github.io/KLighD/v3.0.1/"/>
     </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.sdk.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
+      <repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="com.github.spotbugs.plugin.eclipse.feature.group" version="0.0.0"/>

diff --git a/org.lflang.ui.tests/pom.xml b/org.lflang.ui.tests/pom.xml
@@ -12,7 +12,27 @@
 
   <artifactId>org.lflang.ui.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
-
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tychoVersion}</version>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <requirement>
+                <!-- Include javax.annotation which is needed by JUnit4 but not included by newer JDKs anymore. -->
+                 <type>eclipse-plugin</type>
+                 <id>javax.annotation</id>
+                 <versionRange>0.0.0</versionRange>
+               </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
   <name>Lingua Franca UI Tests</name>
 
 </project>
diff --git a/org.lflang/.project b/org.lflang/.project
@@ -25,14 +25,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>

diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
@@ -25,14 +25,11 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase.ide,
  de.cau.cs.kieler.klighd;bundle-version="2.2.0",
  de.cau.cs.kieler.klighd.krendering.extensions;bundle-version="2.2.0",
- de.cau.cs.kieler.klighd.lsp;bundle-version="2.2.0",
- de.cau.cs.kieler.kgraph.text;bundle-version="2.2.0",
  org.eclipse.elk.core;bundle-version="0.8.1",
  org.eclipse.elk.alg.layered;bundle-version="0.8.1",
  org.eclipse.core.resources;bundle-version="3.16.0",
  org.eclipse.lsp4j;bundle-version="0.14.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.14.0",
- org.eclipse.sprotty;bundle-version="0.9.0",
  org.lflang.epoch.mirror.json;bundle-version="1.20230618.0",
  org.lflang.epoch.mirror.kotlin;bundle-version="1.6.21",
  org.lflang.epoch.mirror.jcip;bundle-version="1.0.0",

diff --git a/org.lflang/lingua-franca b/org.lflang/lingua-franca
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
         <!-- Eclipse specific components -->
         <!-- Important: Any version specified for these plugins must be available via the update sites listed in the target platform definition. If not, the Epoch build will fail! You can find the target platform definition in org.lflang.targetplatform/org.lflang.targetplatform.target. Changes to the target platform should also be transferred to the oomph setup (oomph/LinguaFranca.setup). -->
-        <xtextVersion>2.31.0</xtextVersion>
+        <xtextVersion>2.34.0</xtextVersion>
         <lsp4jVersion>0.21.0</lsp4jVersion> <!-- This plugin is provided by Xtext -->
         <mwe2LaunchVersion>2.14.0</mwe2LaunchVersion> <!-- This plugin is provided by Eclipse, not Xtext -->