Merge pull request #108 from kieler/nre/sprotty-111

Remove Sprotty as P2 dependency, update to Maven Dependency LSP4J 0.22.0 for downstream alignment with Sprotty
kieler · Mar 13, 2024 · e397aad · e397aad
2 parents 60a76b4 + 608070b
commit e397aad
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 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
@@ -30,10 +30,6 @@
       <unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
       <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
     </location>
-    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
-    </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"/>
       <unit id="de.cau.cs.kieler.klighd.freehep.feature.feature.group" version="0.0.0"/>

diff --git a/build/pom.xml b/build/pom.xml
@@ -12,7 +12,7 @@
     <!-- Language server dependency versions -->
     <elk-version>0.9.0</elk-version>
     <klighd-version>2.3.0.v20230606</klighd-version>
-    <lsp4j-version>0.21.1</lsp4j-version>
+    <lsp4j-version>0.22.0</lsp4j-version>
     <pragmatics-version>0.50.0.v20230607</pragmatics-version>
 
     <!-- Xtext compile dependency versions -->

diff --git a/oomph/kieler-semantics-developers.setup b/oomph/kieler-semantics-developers.setup
@@ -11,7 +11,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 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/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"
+    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/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"
     name="kieler-semantics"
     label="KIELER Semantics">
   <setupTask
@@ -468,9 +468,6 @@
             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.eclipse.elk.sdk.feature.feature.group"/>
         <requirement
@@ -532,8 +529,6 @@
               url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
           <repository
               url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
-          <repository
-              url="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
           <repository
               url="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
           <repository
@@ -2428,9 +2423,6 @@
             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.eclipse.elk.sdk.feature.feature.group"/>
         <requirement
@@ -2465,8 +2457,6 @@
             name="de.cau.cs.kieler.websocket.mirror"/>
         <requirement
             name="jakarta.servlet-api"/>
-        <requirement
-            name="org.eclipse.sprotty"/>
         <repositoryList
             name="FixedTarget">
           <repository
@@ -2475,14 +2465,10 @@
               url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
           <repository
               url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
-          <repository
-              url="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/>
           <repository
               url="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
           <repository
               url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/nightly/klighd/"/>
-          <repository
-              url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
           <repository
               url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/"/>
         </repositoryList>

diff --git a/plugins/de.cau.cs.kieler.kicool.ide/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kicool.ide/META-INF/MANIFEST.MF
@@ -15,9 +15,6 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtend.lib.macro,
  org.eclipse.emf.compare,
  org.eclipse.core.runtime;bundle-version="3.13.0",
- org.eclipse.lsp4j;bundle-version="0.6.0",
- org.eclipse.lsp4j.jsonrpc;bundle-version="0.6.0",
- org.eclipse.lsp4j.generator;bundle-version="0.6.0",
  org.apache.log4j;bundle-version="1.2.15",
  de.cau.cs.kieler.klighd,
  de.cau.cs.kieler.klighd.ide,