Skip to content

Commit eb09200

Browse files
a-sra-sr
authored
Merge pull request #97 from kieler/nre/update-2023-09
Updated target platform to Eclipse 2023-12 release
2 parents efe9a2a + ad5b1d0 commit eb09200

File tree

43 files changed

+258
-267
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+258
-267
lines changed

‎build/de.cau.cs.kieler.semantics.repository/category.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
<category name="kieler-sources"/>
3333
</feature>
3434
<!-- Repository references to associated sites -->
35-
<repository-reference location="https://download.eclipse.org/releases/2023-06" enabled="true"/>
36-
<repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/" enabled="true"/>
37-
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/" enabled="true"/>
38-
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/" enabled="true"/>
35+
<repository-reference location="https://download.eclipse.org/releases/2023-12" enabled="true"/>
36+
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0" enabled="true"/>
37+
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/" enabled="true"/>
38+
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/" enabled="true"/>
3939
<repository-reference location="https://kieler.github.io/KLighD/v2.3.0/" enabled="true"/>
4040
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06" enabled="true"/>
41-
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true"/>
42-
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.15/" enabled="true"/>
41+
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.0/" enabled="true"/>
42+
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/" enabled="true"/>
4343
</site>

‎build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target

+14-9
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,29 @@
1010
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
1111
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
1212
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
13-
<unit id="org.eclipse.jetty.server" version="0.0.0"/>
14-
<unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
13+
<repository location="https://download.eclipse.org/releases/2023-12"/>
14+
</location>
15+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
16+
<!-- Remove when no longer required by Klighd -->
17+
<unit id="javax.inject" version="0.0.0"/>
18+
<!-- Required for JUnit4 Tests to be able to run -->
19+
<!-- Remove when updating to JUnit5 or another solution is found.-->
20+
<unit id="javax.annotation" version="0.0.0"/>
1521
<repository location="https://download.eclipse.org/releases/2023-06"/>
1622
</location>
1723
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
18-
<unit id="jakarta.servlet" version="0.0.0"/>
1924
<unit id="com.google.gson" version="0.0.0"/>
20-
<unit id="org.freemarker" version="0.0.0"/>
21-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
25+
<unit id="org.freemarker.freemarker" version="0.0.0"/>
26+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
2227
</location>
2328
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2429
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
2530
<unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
26-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
31+
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
2732
</location>
2833
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2934
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
30-
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/"/>
35+
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
3136
</location>
3237
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
3338
<unit id="de.cau.cs.kieler.klighd.feature.feature.group" version="0.0.0"/>
@@ -47,11 +52,11 @@
4752
<unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
4853
<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
4954
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
50-
<repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
55+
<repository location="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
5156
</location>
5257
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
5358
<unit id="de.cau.cs.kieler.websocket.mirror" version="0.0.0"/>
54-
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.15/"/>
59+
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/"/>
5560
</location>
5661
</locations>
5762
</target>

‎build/pom.xml

+17-5
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<!-- Define a few properties used throughout all build profiles. -->
1111
<properties>
1212
<!-- Language server dependency versions -->
13-
<elk-version>0.8.1</elk-version>
13+
<elk-version>0.9.0</elk-version>
1414
<klighd-version>2.3.0.v20230606</klighd-version>
15-
<lsp4j-version>0.21.0</lsp4j-version>
15+
<lsp4j-version>0.21.1</lsp4j-version>
1616
<pragmatics-version>0.50.0.v20230607</pragmatics-version>
1717

1818
<!-- Xtext compile dependency versions -->
19-
<xtend-version>2.31.0</xtend-version>
20-
<xtext-version>2.31.0</xtext-version>
19+
<xtend-version>2.33.0</xtend-version>
20+
<xtext-version>2.33.0</xtext-version>
2121

2222
<!-- Tycho -->
2323
<tycho-version>2.7.5</tycho-version>
@@ -210,6 +210,18 @@
210210
</pluginRepository>
211211
</pluginRepositories>
212212

213+
214+
<dependencyManagement>
215+
<dependencies>
216+
<!-- 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. -->
217+
<dependency>
218+
<groupId>xml-apis</groupId>
219+
<artifactId>xml-apis-ext</artifactId>
220+
<version>1.3.04</version>
221+
</dependency>
222+
</dependencies>
223+
</dependencyManagement>
224+
213225
<build>
214226
<resources>
215227
<resource>
@@ -354,7 +366,7 @@
354366
<plugin>
355367
<groupId>org.codehaus.mojo</groupId>
356368
<artifactId>build-helper-maven-plugin</artifactId>
357-
<version>1.3</version>
369+
<version>3.5.0</version>
358370
<executions>
359371
<execution>
360372
<id>add-source</id>

‎build/scripts/uberjar.py

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
'META-INF/MANIFEST.MF', # not sure if we have to merge the content somehow?
7070
'META-INF/maven/*',
7171
'META-INF/NOTICE.txt',
72+
'META-INF/NOTICE.md',
7273
'META-INF/NOTICE',
7374
'META-INF/p2.inf',
7475
'META-INF/versions/*/module-info.class',
@@ -87,6 +88,7 @@
8788
'plugin.properties',
8889
'META-INF/services/*',
8990
'META-INF/LICENSE.txt',
91+
'META-INF/LICENSE.md',
9092
'META-INF/LICENSE',
9193
]
9294
IGNORE_MERGE = [

‎discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
3030
import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions
3131
import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
3232
import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis
33-
import javax.inject.Inject
33+
import com.google.inject.Inject
3434
import org.eclipse.elk.alg.layered.options.LayeredOptions
3535
import org.eclipse.elk.alg.layered.options.NodePlacementStrategy
3636
import org.eclipse.elk.core.options.CoreOptions

‎discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
3030
import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions
3131
import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
3232
import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis
33-
import javax.inject.Inject
33+
import com.google.inject.Inject
3434
import org.eclipse.elk.alg.layered.options.LayeredOptions
3535
import org.eclipse.elk.alg.layered.options.NodePlacementStrategy
3636
import org.eclipse.elk.core.options.CoreOptions

‎discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions
2525
import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
2626
import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
2727
import de.cau.cs.kieler.klighd.util.KlighdProperties
28-
import javax.inject.Inject
28+
import com.google.inject.Inject
2929
import org.eclipse.elk.alg.layered.p2layers.LayeringStrategy
3030
import org.eclipse.elk.alg.layered.properties.LayeredOptions
3131
import org.eclipse.elk.core.options.CoreOptions

‎discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
3030
import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
3131
import de.cau.cs.kieler.klighd.util.KlighdProperties
3232
import java.util.ArrayList
33-
import javax.inject.Inject
33+
import com.google.inject.Inject
3434
import org.eclipse.elk.core.options.CoreOptions
3535
import org.eclipse.elk.core.options.EdgeRouting
3636

‎discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions
3030
import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions
3131
import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
3232
import de.cau.cs.kieler.klighd.util.KlighdProperties
33-
import javax.inject.Inject
33+
import com.google.inject.Inject
3434
import org.eclipse.elk.core.options.CoreOptions
3535
import org.eclipse.elk.core.options.Direction
3636
import org.eclipse.elk.core.options.EdgeRouting

‎discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import de.cau.cs.kieler.klighd.util.KlighdProperties
3131
import java.util.ArrayList
3232
import java.util.HashSet
3333
import java.util.Set
34-
import javax.inject.Inject
34+
import com.google.inject.Inject
3535
import org.eclipse.elk.core.options.CoreOptions
3636
import org.eclipse.elk.core.options.Direction
3737
import org.eclipse.elk.core.options.EdgeRouting

‎discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import java.util.HashMap
3232
import java.util.HashSet
3333
import java.util.List
3434
import java.util.Set
35-
import javax.inject.Inject
35+
import com.google.inject.Inject
3636

3737
import static extension org.eclipse.emf.ecore.util.EcoreUtil.*
3838

‎language-server/de.cau.cs.kieler.language.server/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@
6262
<dependency>
6363
<groupId>com.google.code.gson</groupId>
6464
<artifactId>gson</artifactId>
65-
<version>2.9.0</version>
65+
<version>2.10.1</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.google.inject</groupId>
6969
<artifactId>guice</artifactId>
70-
<version>5.1.0</version>
70+
<version>7.0.0</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.apache.logging.log4j</groupId>

0 commit comments

Comments
 (0)