Merge pull request #109 from kieler/sdo/fixOomphForELK

Updated ELK semantics setup
kieler · Apr 11, 2024 · 0571474 · 0571474
2 parents e397aad + af7e081
commit 0571474
Showing 1 changed file with 17 additions and 23 deletions.
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 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"
+    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"
     name="kieler-semantics"
     label="KIELER Semantics">
   <setupTask
@@ -2761,50 +2761,44 @@
             name="edu.umd.cs.piccolo"/>
         <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.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"/>
-        <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"/>
+            name="de.cau.cs.kieler.websocket.mirror"
+            versionRange="10.0.20"/>
         <requirement
             name="jakarta.servlet"/>
         <requirement
             name="org.eclipse.sprotty"/>
         <repositoryList
             name="FixedTarget">
           <repository
-              url="https://download.eclipse.org/releases/2023-06"/>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+              url="https://download.eclipse.org/releases/2023-12"/>
           <repository
-              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
+              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
           <repository
-              url="https://download.eclipse.org/lsp4j/updates/releases/0.21.0"/>
+              url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.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.15/"/>
+              url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/"/>
           <repository
-              url="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
+              url="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
         </repositoryList>
       </targlet>
     </setupTask>
@@ -2814,13 +2808,13 @@
           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)"/>
       <repository
           url="https://download.eclipse.org/elk/updates/nightly/"/>
       <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.33.0/"/>
     </setupTask>
   </stream>
   <logicalProjectContainer