From 55181d95bce385f840ca64dd2b9955c1467b5ab4 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 14 Jun 2022 22:24:29 -0700
Subject: [PATCH 01/13] Bump Xtext, downgrade Eclipse runtime version

---
 gradle.properties                        | 4 ++--
 org.lflang.diagram/META-INF/MANIFEST.MF  | 4 ++--
 org.lflang.tests/META-INF/MANIFEST.MF    | 6 +++---
 org.lflang.ui.tests/META-INF/MANIFEST.MF | 2 +-
 org.lflang.ui/META-INF/MANIFEST.MF       | 2 +-
 org.lflang/META-INF/MANIFEST.MF          | 2 +-
 pom.xml                                  | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 6c056af58a..eb58fef4ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,10 +15,10 @@ lsp4jVersion=0.12.0
 mwe2LaunchVersion=2.12.2
 openTest4jVersion=1.2.0
 resourcesVersion=3.16.0
-runtimeVersion=3.24.0
+runtimeVersion=3.23.0
 shadowJarVersion=7.1.2
 xtextGradleVersion=3.0.0
-xtextVersion=2.26.0
+xtextVersion=2.27.0
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion
diff --git a/org.lflang.diagram/META-INF/MANIFEST.MF b/org.lflang.diagram/META-INF/MANIFEST.MF
index 25196dadf1..36b176a82d 100644
--- a/org.lflang.diagram/META-INF/MANIFEST.MF
+++ b/org.lflang.diagram/META-INF/MANIFEST.MF
@@ -14,10 +14,10 @@ Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
  org.eclipse.xtext.xbase.lib,
  org.eclipse.elk.core;bundle-version="0.7.0",
  org.eclipse.elk.alg.layered;bundle-version="0.7.0",
- org.eclipse.core.resources;bundle-version="3.13.900",
+ org.eclipse.core.resources;bundle-version="3.16.0",
  org.lflang;bundle-version="0.1.0",
  org.lflang.ide;bundle-version="0.1.0",
- org.eclipse.xtext.ide;bundle-version="2.26.0",
+ org.eclipse.xtext.ide;bundle-version="2.27.0",
  org.eclipse.lsp4j;bundle-version="0.12.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.0",
  org.eclipse.sprotty;bundle-version="0.9.0"
diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF
index 51fe5e1a21..425420760b 100644
--- a/org.lflang.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.tests/META-INF/MANIFEST.MF
@@ -7,13 +7,13 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang,
- org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
+ org.junit.jupiter.api;bundle-version="5.8.2",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
  javax.annotation;bundle-version="1.2.0",
  org.eclipse.core.jobs,
  org.opentest4j;bundle-version="1.2.0",
- org.eclipse.lsp4j;bundle-version="0.10.0"
+ org.eclipse.lsp4j;bundle-version="0.12.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.lflang.tests;x-internal=true
diff --git a/org.lflang.ui.tests/META-INF/MANIFEST.MF b/org.lflang.ui.tests/META-INF/MANIFEST.MF
index dfe9bbf854..318aac02e4 100644
--- a/org.lflang.ui.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.ui.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang.ui,
- org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
+ org.junit.jupiter.api;bundle-version="5.8.2",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.junit4,
diff --git a/org.lflang.ui/META-INF/MANIFEST.MF b/org.lflang.ui/META-INF/MANIFEST.MF
index acf968c32c..cfa1aa2256 100644
--- a/org.lflang.ui/META-INF/MANIFEST.MF
+++ b/org.lflang.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.lflang,
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
- org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
  org.eclipse.ui.intro,
  org.eclipse.ui.intro.universal,
  org.eclipse.ui.console;bundle-version="3.10.100",
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index 6d52881818..ab25d7de09 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.5.0",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
diff --git a/pom.xml b/pom.xml
index 4ae75400d3..1366b2ac15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,9 +22,9 @@
         <lsp4jVersion>0.12.0</lsp4jVersion>
         <mwe2LaunchVersion>2.12.2</mwe2LaunchVersion>
         <!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
-        <xtextVersion>2.26.0</xtextVersion>
+        <xtextVersion>2.27.0</xtextVersion>
         <tychoVersion>2.6.0</tychoVersion>
-        <runtimeVersion>3.24.0</runtimeVersion>
+        <runtimeVersion>3.23.0</runtimeVersion>
 
         <!-- Maven only properties -->
         <maven.compiler.source>17</maven.compiler.source>

From ec0012f35928ecdd8ab6bac11c45e69a39955390 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 14 Jun 2022 22:40:35 -0700
Subject: [PATCH 02/13] Downgrading Xtext again because 2.27.0 cannot be found
 on Maven Central

---
 gradle.properties                       | 2 +-
 org.lflang.diagram/META-INF/MANIFEST.MF | 2 +-
 org.lflang.tests/META-INF/MANIFEST.MF   | 2 +-
 org.lflang.ui/META-INF/MANIFEST.MF      | 2 +-
 org.lflang/META-INF/MANIFEST.MF         | 2 +-
 pom.xml                                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eb58fef4ab..f34fbb6197 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ resourcesVersion=3.16.0
 runtimeVersion=3.23.0
 shadowJarVersion=7.1.2
 xtextGradleVersion=3.0.0
-xtextVersion=2.27.0
+xtextVersion=2.26.0
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion
diff --git a/org.lflang.diagram/META-INF/MANIFEST.MF b/org.lflang.diagram/META-INF/MANIFEST.MF
index 36b176a82d..d0707021e1 100644
--- a/org.lflang.diagram/META-INF/MANIFEST.MF
+++ b/org.lflang.diagram/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
  org.eclipse.core.resources;bundle-version="3.16.0",
  org.lflang;bundle-version="0.1.0",
  org.lflang.ide;bundle-version="0.1.0",
- org.eclipse.xtext.ide;bundle-version="2.27.0",
+ org.eclipse.xtext.ide;bundle-version="2.26.0",
  org.eclipse.lsp4j;bundle-version="0.12.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.0",
  org.eclipse.sprotty;bundle-version="0.9.0"
diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF
index 425420760b..13c280c374 100644
--- a/org.lflang.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.lflang,
  org.junit.jupiter.api;bundle-version="5.8.2",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
  javax.annotation;bundle-version="1.2.0",
  org.eclipse.core.jobs,
  org.opentest4j;bundle-version="1.2.0",
diff --git a/org.lflang.ui/META-INF/MANIFEST.MF b/org.lflang.ui/META-INF/MANIFEST.MF
index cfa1aa2256..acf968c32c 100644
--- a/org.lflang.ui/META-INF/MANIFEST.MF
+++ b/org.lflang.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.lflang,
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
- org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
  org.eclipse.ui.intro,
  org.eclipse.ui.intro.universal,
  org.eclipse.ui.console;bundle-version="3.10.100",
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index ab25d7de09..6d52881818 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.5.0",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
diff --git a/pom.xml b/pom.xml
index 1366b2ac15..5f121c10b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <lsp4jVersion>0.12.0</lsp4jVersion>
         <mwe2LaunchVersion>2.12.2</mwe2LaunchVersion>
         <!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
-        <xtextVersion>2.27.0</xtextVersion>
+        <xtextVersion>2.26.0</xtextVersion>
         <tychoVersion>2.6.0</tychoVersion>
         <runtimeVersion>3.23.0</runtimeVersion>
 

From d694b0008948300aa9efc012077480c48754fb8c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Tue, 14 Jun 2022 23:03:58 -0700
Subject: [PATCH 03/13] Apply suggestions from code review

Reverting changes made to `org.junit.jupiter.api`
---
 org.lflang.tests/META-INF/MANIFEST.MF    | 2 +-
 org.lflang.ui.tests/META-INF/MANIFEST.MF | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF
index 13c280c374..0528715e69 100644
--- a/org.lflang.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang,
- org.junit.jupiter.api;bundle-version="5.8.2",
+ org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
diff --git a/org.lflang.ui.tests/META-INF/MANIFEST.MF b/org.lflang.ui.tests/META-INF/MANIFEST.MF
index 318aac02e4..dfe9bbf854 100644
--- a/org.lflang.ui.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.ui.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang.ui,
- org.junit.jupiter.api;bundle-version="5.8.2",
+ org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.junit4,

From 284217ab1c5eb1724481ca76b3cd011d04b0485c Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 17 Jun 2022 14:08:47 -0700
Subject: [PATCH 04/13] Revert "Apply suggestions from code review
"

This
 reverts commit d694b0008948300aa9efc012077480c48754fb8c.

# Please enter the
 commit message for your changes. Lines starting
# with '#' will be ignored,
 and an empty message aborts the commit.
#
# On branch version-updates
# Your
 branch is up to date with 'origin/version-updates'.
#
# Changes to be
 committed:
#	modified:   org.lflang.tests/META-INF/MANIFEST.MF
#
 modified:   org.lflang.ui.tests/META-INF/MANIFEST.MF
#
# Untracked files:
#
 RELEASE.md
#	build_upload/
#	bump.sh
#	hs_err_pid24495.log
#
 hs_err_pid37983.log
#	junk/
#	lfc_0.2.0-SNAPSHOT/
#	lfc_0.2.0/
#
 lfc_nightly_20220202-230344/
#	lfc_nightly_20220502-232308/
#
 lfc_nightly_20220502-232420/
#
 org.lflang/src/org/lflang/federated/ProxyEmitter.java
#
 test/C/fed-gen/
#

---
 org.lflang.tests/META-INF/MANIFEST.MF    | 2 +-
 org.lflang.ui.tests/META-INF/MANIFEST.MF | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF
index 0528715e69..13c280c374 100644
--- a/org.lflang.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang,
- org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
+ org.junit.jupiter.api;bundle-version="5.8.2",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
diff --git a/org.lflang.ui.tests/META-INF/MANIFEST.MF b/org.lflang.ui.tests/META-INF/MANIFEST.MF
index dfe9bbf854..318aac02e4 100644
--- a/org.lflang.ui.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.ui.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang.ui,
- org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)",
+ org.junit.jupiter.api;bundle-version="5.8.2",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.junit4,

From 09600736eca95b673934c1761055b2c0a51fe9b7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 17 Jun 2022 14:09:10 -0700
Subject: [PATCH 05/13] Revert "Downgrading Xtext again because 2.27.0 cannot
 be found on Maven Central"

This reverts commit ec0012f35928ecdd8ab6bac11c45e69a39955390.
---
 gradle.properties                       | 2 +-
 org.lflang.diagram/META-INF/MANIFEST.MF | 2 +-
 org.lflang.tests/META-INF/MANIFEST.MF   | 2 +-
 org.lflang.ui/META-INF/MANIFEST.MF      | 2 +-
 org.lflang/META-INF/MANIFEST.MF         | 2 +-
 pom.xml                                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f34fbb6197..eb58fef4ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@ resourcesVersion=3.16.0
 runtimeVersion=3.23.0
 shadowJarVersion=7.1.2
 xtextGradleVersion=3.0.0
-xtextVersion=2.26.0
+xtextVersion=2.27.0
 
 [manifestPropertyNames]
 org.eclipse.xtext=xtextVersion
diff --git a/org.lflang.diagram/META-INF/MANIFEST.MF b/org.lflang.diagram/META-INF/MANIFEST.MF
index d0707021e1..36b176a82d 100644
--- a/org.lflang.diagram/META-INF/MANIFEST.MF
+++ b/org.lflang.diagram/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
  org.eclipse.core.resources;bundle-version="3.16.0",
  org.lflang;bundle-version="0.1.0",
  org.lflang.ide;bundle-version="0.1.0",
- org.eclipse.xtext.ide;bundle-version="2.26.0",
+ org.eclipse.xtext.ide;bundle-version="2.27.0",
  org.eclipse.lsp4j;bundle-version="0.12.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.0",
  org.eclipse.sprotty;bundle-version="0.9.0"
diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF
index 13c280c374..425420760b 100644
--- a/org.lflang.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.lflang,
  org.junit.jupiter.api;bundle-version="5.8.2",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
  javax.annotation;bundle-version="1.2.0",
  org.eclipse.core.jobs,
  org.opentest4j;bundle-version="1.2.0",
diff --git a/org.lflang.ui/META-INF/MANIFEST.MF b/org.lflang.ui/META-INF/MANIFEST.MF
index acf968c32c..cfa1aa2256 100644
--- a/org.lflang.ui/META-INF/MANIFEST.MF
+++ b/org.lflang.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.lflang,
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
- org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
  org.eclipse.ui.intro,
  org.eclipse.ui.intro.universal,
  org.eclipse.ui.console;bundle-version="3.10.100",
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index 6d52881818..ab25d7de09 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common;bundle-version="3.5.0",
  org.eclipse.emf.ecore,
- org.eclipse.xtext.xbase.lib;bundle-version="2.26.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
  org.eclipse.xtext.util,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
diff --git a/pom.xml b/pom.xml
index 5f121c10b3..1366b2ac15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
         <lsp4jVersion>0.12.0</lsp4jVersion>
         <mwe2LaunchVersion>2.12.2</mwe2LaunchVersion>
         <!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
-        <xtextVersion>2.26.0</xtextVersion>
+        <xtextVersion>2.27.0</xtextVersion>
         <tychoVersion>2.6.0</tychoVersion>
         <runtimeVersion>3.23.0</runtimeVersion>
 

From 930ccb129ca0a34d08a1da631d82ff7aa24b1a54 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 17 Jun 2022 16:07:08 -0700
Subject: [PATCH 06/13] Bump lsp4j to 0.14.0

---
 gradle.properties                       | 2 +-
 org.lflang.diagram/META-INF/MANIFEST.MF | 4 ++--
 org.lflang.tests/META-INF/MANIFEST.MF   | 2 +-
 org.lflang/META-INF/MANIFEST.MF         | 2 +-
 pom.xml                                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index eb58fef4ab..2734f9a8a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ jUnitPlatformVersion=1.8.2
 jUnitVersion=4.13.2
 kotlinJvmTarget=17
 kotlinVersion=1.6.20
-lsp4jVersion=0.12.0
+lsp4jVersion=0.14.0
 mwe2LaunchVersion=2.12.2
 openTest4jVersion=1.2.0
 resourcesVersion=3.16.0
diff --git a/org.lflang.diagram/META-INF/MANIFEST.MF b/org.lflang.diagram/META-INF/MANIFEST.MF
index 36b176a82d..6bfe31d953 100644
--- a/org.lflang.diagram/META-INF/MANIFEST.MF
+++ b/org.lflang.diagram/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
  org.lflang;bundle-version="0.1.0",
  org.lflang.ide;bundle-version="0.1.0",
  org.eclipse.xtext.ide;bundle-version="2.27.0",
- org.eclipse.lsp4j;bundle-version="0.12.0",
- org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.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"
 Bundle-Vendor: University of California, Berkeley
diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF
index 425420760b..e9e7ec598b 100644
--- a/org.lflang.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.tests/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle: org.lflang,
  javax.annotation;bundle-version="1.2.0",
  org.eclipse.core.jobs,
  org.opentest4j;bundle-version="1.2.0",
- org.eclipse.lsp4j;bundle-version="0.12.0"
+ org.eclipse.lsp4j;bundle-version="0.14.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.lflang.tests;x-internal=true
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index ab25d7de09..a130e6034b 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext,
  com.google.guava,
  org.apache.commons.cli;bundle-version="1.4",
  org.jetbrains.kotlin.bundled-compiler;resolution:=optional,
- org.eclipse.lsp4j;bundle-version="0.12.0",
+ org.eclipse.lsp4j;bundle-version="0.14.0",
  com.fasterxml.jackson.core.jackson-core,
  com.fasterxml.jackson.core.jackson-annotations,
  com.fasterxml.jackson.core.jackson-databind,
diff --git a/pom.xml b/pom.xml
index 1366b2ac15..4389193d92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
         <commonsCliVersion>1.4</commonsCliVersion>
         <!-- Note that this version is tied to our version of Gradle -->
         <kotlinVersion>1.6.20</kotlinVersion>
-        <lsp4jVersion>0.12.0</lsp4jVersion>
+        <lsp4jVersion>0.14.0</lsp4jVersion>
         <mwe2LaunchVersion>2.12.2</mwe2LaunchVersion>
         <!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
         <xtextVersion>2.27.0</xtextVersion>

From c3d964f42d8b6c4d1acadfb7e4a7bb90de732da7 Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Fri, 17 Jun 2022 18:03:46 -0700
Subject: [PATCH 07/13] Bump Eclipse runtime to 3.25.0

---
 gradle.properties               | 2 +-
 org.lflang/META-INF/MANIFEST.MF | 2 +-
 pom.xml                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 2734f9a8a4..380874839b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,7 @@ lsp4jVersion=0.14.0
 mwe2LaunchVersion=2.12.2
 openTest4jVersion=1.2.0
 resourcesVersion=3.16.0
-runtimeVersion=3.23.0
+runtimeVersion=3.25.0
 shadowJarVersion=7.1.2
 xtextGradleVersion=3.0.0
 xtextVersion=2.27.0
diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF
index a130e6034b..a368d1e992 100644
--- a/org.lflang/META-INF/MANIFEST.MF
+++ b/org.lflang/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext,
  com.fasterxml.jackson.core.jackson-core,
  com.fasterxml.jackson.core.jackson-annotations,
  com.fasterxml.jackson.core.jackson-databind,
- org.eclipse.core.runtime;bundle-version="3.23.0"
+ org.eclipse.core.runtime;bundle-version="3.25.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.lflang,
  org.lflang.generator,
diff --git a/pom.xml b/pom.xml
index 4389193d92..b74b0bd7fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
         <xtextVersion>2.27.0</xtextVersion>
         <tychoVersion>2.6.0</tychoVersion>
-        <runtimeVersion>3.23.0</runtimeVersion>
+        <runtimeVersion>3.25.0</runtimeVersion>
 
         <!-- Maven only properties -->
         <maven.compiler.source>17</maven.compiler.source>

From b6badd58e4fb8933cd23e541021d895dc70a036f Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Tue, 21 Jun 2022 11:03:50 +0200
Subject: [PATCH 08/13] Updated update sites for xtext and eclipse in target
 platform

---
 org.lflang.targetplatform/org.lflang.targetplatform.target | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.lflang.targetplatform/org.lflang.targetplatform.target b/org.lflang.targetplatform/org.lflang.targetplatform.target
index 54bca9ba33..227fb8c61b 100644
--- a/org.lflang.targetplatform/org.lflang.targetplatform.target
+++ b/org.lflang.targetplatform/org.lflang.targetplatform.target
@@ -32,18 +32,18 @@
       <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"/>
-      <repository location="http://download.eclipse.org/releases/2022-03"/>
+      <repository location="http://download.eclipse.org/releases/2022-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.ui.feature.group" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/"/>
+      <repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.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="javax.activation" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.jetbrains.kotlin.feature.feature.group" version="0.0.0"/>

From e629ceac48ec20c706355903cc659e393df3ad70 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Tue, 21 Jun 2022 11:05:26 +0200
Subject: [PATCH 09/13] Updated dependencies in oomph setup

---
 oomph/LinguaFranca.setup | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/oomph/LinguaFranca.setup b/oomph/LinguaFranca.setup
index 30a5843e13..2c563e2afb 100644
--- a/oomph/LinguaFranca.setup
+++ b/oomph/LinguaFranca.setup
@@ -161,7 +161,7 @@
         name="org.eclipse.tm.terminal.feature.feature.group"/>
     <requirement
         name="org.eclipse.xtext.sdk.feature.group"
-        versionRange="2.26.0"/>
+        versionRange="2.27.0"/>
     <repository
         url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
@@ -302,10 +302,10 @@
             versionRange="27.0.0"/>
         <requirement
             name="org.eclipse.xtext.runtime.feature.group"
-            versionRange="2.26.0"/>
+            versionRange="2.27.0"/>
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"
-            versionRange="2.26.0"/>
+            versionRange="2.27.0"/>
         <requirement
             name="org.eclipse.platform.source.feature.group"/>
         <requirement
@@ -349,11 +349,11 @@
         <repositoryList
             name="DefaultRepositories">
           <repository
-              url="http://download.eclipse.org/releases/2022-03"/>
+              url="http://download.eclipse.org/releases/2022-06"/>
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
           <repository
-              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/"/>
+              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
           <repository
               url="http://download.eclipse.org/elk/updates/releases/0.7.1/"/>
           <repository

From 4ad782bb39e65fda4f0f0b415a17cf66989fb0a9 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Tue, 21 Jun 2022 11:20:43 +0200
Subject: [PATCH 10/13] Downgraded junit.jupiter dependency to 5.8.1

---
 org.lflang.tests/META-INF/MANIFEST.MF    | 2 +-
 org.lflang.ui.tests/META-INF/MANIFEST.MF | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF
index e9e7ec598b..6955f40ff5 100644
--- a/org.lflang.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang,
- org.junit.jupiter.api;bundle-version="5.8.2",
+ org.junit.jupiter.api;bundle-version="5.8.1",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.xbase.lib;bundle-version="2.27.0",
diff --git a/org.lflang.ui.tests/META-INF/MANIFEST.MF b/org.lflang.ui.tests/META-INF/MANIFEST.MF
index 318aac02e4..715a4b88c7 100644
--- a/org.lflang.ui.tests/META-INF/MANIFEST.MF
+++ b/org.lflang.ui.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier
 Bundle-SymbolicName: org.lflang.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.lflang.ui,
- org.junit.jupiter.api;bundle-version="5.8.2",
+ org.junit.jupiter.api;bundle-version="5.8.1",
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  org.eclipse.xtext.junit4,

From 7b2b5f4e5e4dac5c7b387a5591868c879732cf37 Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Tue, 21 Jun 2022 11:36:54 +0200
Subject: [PATCH 11/13] Updated mwe2 launch version in accordance with new
 target platform

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b74b0bd7fb..8423bf4bc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
         <!-- Note that this version is tied to our version of Gradle -->
         <kotlinVersion>1.6.20</kotlinVersion>
         <lsp4jVersion>0.14.0</lsp4jVersion>
-        <mwe2LaunchVersion>2.12.2</mwe2LaunchVersion>
+        <mwe2LaunchVersion>2.13.0</mwe2LaunchVersion>
         <!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
         <xtextVersion>2.27.0</xtextVersion>
         <tychoVersion>2.6.0</tychoVersion>

From 6f17c459f1372c83d2674b89cbca1f6b3129c2cd Mon Sep 17 00:00:00 2001
From: Alexander Schulz-Rosengarten <als@informatik.uni-kiel.de>
Date: Tue, 21 Jun 2022 11:56:27 +0200
Subject: [PATCH 12/13] Added a few comments to the pom file to prevent future
 problems with the target platform.

---
 pom.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8423bf4bc9..59d927143d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,12 +19,16 @@
         <commonsCliVersion>1.4</commonsCliVersion>
         <!-- Note that this version is tied to our version of Gradle -->
         <kotlinVersion>1.6.20</kotlinVersion>
-        <lsp4jVersion>0.14.0</lsp4jVersion>
-        <mwe2LaunchVersion>2.13.0</mwe2LaunchVersion>
-        <!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
+
+        <!-- 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). -->
+        <runtimeVersion>3.25.0</runtimeVersion> <!-- This version reflects the actual Eclipse release (e.g. 3.25 -> 2022-06) -->
         <xtextVersion>2.27.0</xtextVersion>
+        <lsp4jVersion>0.14.0</lsp4jVersion> <!-- This plugin is provided by Xtext -->
+        <mwe2LaunchVersion>2.13.0</mwe2LaunchVersion> <!-- This plugin is provided by Eclipse, not Xtext -->
+
+        <!-- Tycho version used by Maven (Eclipse specific build support)-->
         <tychoVersion>2.6.0</tychoVersion>
-        <runtimeVersion>3.25.0</runtimeVersion>
 
         <!-- Maven only properties -->
         <maven.compiler.source>17</maven.compiler.source>

From 4917bfd453fec165186210412b47d184598e395d Mon Sep 17 00:00:00 2001
From: Marten Lohstroh <marten@berkeley.edu>
Date: Thu, 23 Jun 2022 22:52:45 -0700
Subject: [PATCH 13/13] Update org.lflang.diagram/META-INF/MANIFEST.MF

---
 org.lflang.diagram/META-INF/MANIFEST.MF | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/org.lflang.diagram/META-INF/MANIFEST.MF b/org.lflang.diagram/META-INF/MANIFEST.MF
index 4116c19277..7a4df9df52 100644
--- a/org.lflang.diagram/META-INF/MANIFEST.MF
+++ b/org.lflang.diagram/META-INF/MANIFEST.MF
@@ -12,6 +12,8 @@ Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
  com.google.guava,
  org.eclipse.xtext,
  org.eclipse.xtext.xbase.lib,
+ 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.lflang;bundle-version="0.1.0",
  org.lflang.ide;bundle-version="0.1.0",