Merge pull request #97 from kieler/nre/update-2023-09

Updated target platform to Eclipse 2023-12 release
kieler · Feb 26, 2024 · eb09200 · eb09200
2 parents efe9a2a + ad5b1d0
commit eb09200
Show file tree

Hide file tree

Showing 43 changed files with 258 additions and 267 deletions.
diff --git a/build/de.cau.cs.kieler.semantics.repository/category.xml b/build/de.cau.cs.kieler.semantics.repository/category.xml
@@ -32,12 +32,12 @@
     <category name="kieler-sources"/>
   </feature>
   <!-- Repository references to associated sites -->
-  <repository-reference location="https://download.eclipse.org/releases/2023-06" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/releases/2023-12" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/" enabled="true"/>
   <repository-reference location="https://kieler.github.io/KLighD/v2.3.0/" enabled="true"/>
   <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true"/>
-  <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.15/" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.0/" enabled="true"/>
+  <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/" enabled="true"/>
 </site>
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,24 +10,29 @@
       <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"/>
-      <unit id="org.eclipse.jetty.server" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/releases/2023-12"/>
+    </location>
+    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
+      <!-- Remove when no longer required by Klighd -->
+      <unit id="javax.inject" version="0.0.0"/>
+      <!-- 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="jakarta.servlet" version="0.0.0"/>
       <unit id="com.google.gson" version="0.0.0"/>
-      <unit id="org.freemarker" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
+      <unit id="org.freemarker.freemarker" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.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.31.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.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"/>
@@ -47,11 +52,11 @@
       <unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.sdk.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.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.websocket.mirror" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.15/"/>
+      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/"/>
     </location>
   </locations>
 </target>
diff --git a/build/pom.xml b/build/pom.xml
@@ -10,14 +10,14 @@
   <!-- Define a few properties used throughout all build profiles. -->
   <properties>
     <!-- Language server dependency versions -->
-    <elk-version>0.8.1</elk-version>
+    <elk-version>0.9.0</elk-version>
     <klighd-version>2.3.0.v20230606</klighd-version>
-    <lsp4j-version>0.21.0</lsp4j-version>
+    <lsp4j-version>0.21.1</lsp4j-version>
     <pragmatics-version>0.50.0.v20230607</pragmatics-version>
 
     <!-- Xtext compile dependency versions -->
-    <xtend-version>2.31.0</xtend-version>
-    <xtext-version>2.31.0</xtext-version>
+    <xtend-version>2.33.0</xtend-version>
+    <xtext-version>2.33.0</xtext-version>
 
     <!-- Tycho -->
     <tycho-version>2.7.5</tycho-version>
@@ -210,6 +210,18 @@
     </pluginRepository>
   </pluginRepositories>
 
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- A dependency that Maven artifacts of Eclipse bundles tries to pull the (non-existent) version 1.0.0 from. This version exists and will be used instead. -->
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis-ext</artifactId>
+        <version>1.3.04</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <resources>
       <resource>
@@ -354,7 +366,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.3</version>
+          <version>3.5.0</version>
           <executions>
             <execution>
               <id>add-source</id>

diff --git a/build/scripts/uberjar.py b/build/scripts/uberjar.py
@@ -69,6 +69,7 @@
     'META-INF/MANIFEST.MF', # not sure if we have to merge the content somehow?
     'META-INF/maven/*',
     'META-INF/NOTICE.txt',
+    'META-INF/NOTICE.md',
     'META-INF/NOTICE',
     'META-INF/p2.inf',
     'META-INF/versions/*/module-info.class',
@@ -87,6 +88,7 @@
     'plugin.properties',
     'META-INF/services/*',
     'META-INF/LICENSE.txt',
+    'META-INF/LICENSE.md',
     'META-INF/LICENSE',
 ]
 IGNORE_MERGE = [

diff --git a/...s.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend b/...s.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
 import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.elk.alg.layered.options.LayeredOptions
 import org.eclipse.elk.alg.layered.options.NodePlacementStrategy
 import org.eclipse.elk.core.options.CoreOptions

diff --git a/...er.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend b/...er.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
 import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.elk.alg.layered.options.LayeredOptions
 import org.eclipse.elk.alg.layered.options.NodePlacementStrategy
 import org.eclipse.elk.core.options.CoreOptions

diff --git a/...eler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend b/...eler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend
@@ -25,7 +25,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
 import de.cau.cs.kieler.klighd.util.KlighdProperties
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.elk.alg.layered.p2layers.LayeringStrategy
 import org.eclipse.elk.alg.layered.properties.LayeredOptions
 import org.eclipse.elk.core.options.CoreOptions

diff --git a/...kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend b/...kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
 import de.cau.cs.kieler.klighd.util.KlighdProperties
 import java.util.ArrayList
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.elk.core.options.CoreOptions
 import org.eclipse.elk.core.options.EdgeRouting
 

diff --git a/...ieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend b/...ieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
 import de.cau.cs.kieler.klighd.util.KlighdProperties
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.elk.core.options.CoreOptions
 import org.eclipse.elk.core.options.Direction
 import org.eclipse.elk.core.options.EdgeRouting

diff --git a/...cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend b/...cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend
@@ -31,7 +31,7 @@ import de.cau.cs.kieler.klighd.util.KlighdProperties
 import java.util.ArrayList
 import java.util.HashSet
 import java.util.Set
-import javax.inject.Inject
+import com.google.inject.Inject
 import org.eclipse.elk.core.options.CoreOptions
 import org.eclipse.elk.core.options.Direction
 import org.eclipse.elk.core.options.EdgeRouting

diff --git a/...-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend b/...-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend
@@ -32,7 +32,7 @@ import java.util.HashMap
 import java.util.HashSet
 import java.util.List
 import java.util.Set
-import javax.inject.Inject
+import com.google.inject.Inject
 
 import static extension org.eclipse.emf.ecore.util.EcoreUtil.*
 

diff --git a/language-server/de.cau.cs.kieler.language.server/pom.xml b/language-server/de.cau.cs.kieler.language.server/pom.xml
@@ -62,12 +62,12 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.9.0</version>
+      <version>2.10.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>
-      <version>5.1.0</version>
+      <version>7.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>