Skip to content

Commit 3dd8e03

Browse files
authored
Merge pull request #122 from kieler/als/targetplatform
Upgrade to Eclipse 2024-09 Target Platform
2 parents b181d9c + 6ed1faf commit 3dd8e03

File tree

5 files changed

+26
-12
lines changed

5 files changed

+26
-12
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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-
<repository location="https://download.eclipse.org/releases/2024-03"/>
13+
<repository location="https://download.eclipse.org/releases/2024-09"/>
1414
</location>
1515
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
1616
<!-- Required for JUnit4 Tests to be able to run -->
@@ -21,12 +21,12 @@
2121
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2222
<unit id="com.google.gson" version="0.0.0"/>
2323
<unit id="org.freemarker.freemarker" version="0.0.0"/>
24-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
24+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0"/>
2525
</location>
2626
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2727
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
2828
<unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
29-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
29+
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
3030
</location>
3131
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
3232
<unit id="de.cau.cs.kieler.klighd.feature.feature.group" version="0.0.0"/>

build/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<!-- Language server dependency versions -->
1313
<elk-version>0.9.1</elk-version>
1414
<klighd-version>3.0.2.v20240507</klighd-version>
15-
<lsp4j-version>0.22.0</lsp4j-version>
15+
<lsp4j-version>0.23.0</lsp4j-version>
1616
<pragmatics-version>0.51.0.v20240410</pragmatics-version>
1717

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

2222
<!-- Tycho -->
2323
<tycho-version>2.7.5</tycho-version>

build/scripts/uberjar.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
'META-INF/NOTICE',
7474
'META-INF/p2.inf',
7575
'META-INF/versions/*/module-info.class',
76+
'META-INF/versions/*/OSGI-INF/MANIFEST.MF',
7677
'OSGI-INF/l10n/bundle.properties',
7778
'OSGI-INF/repositoryManager.xml',
7879
'docs/*',

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,19 @@
135135
<version>${lsp4j-version}</version>
136136
</dependency>
137137

138+
139+
<!-- Somehow important -->
140+
<dependency>
141+
<groupId>org.eclipse.platform</groupId>
142+
<artifactId>org.eclipse.core.runtime</artifactId>
143+
<version>3.31.100</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.eclipse.platform</groupId>
147+
<artifactId>org.eclipse.equinox.common</artifactId>
148+
<version>3.19.100</version>
149+
</dependency>
150+
138151
<!-- Additional dependencies that the downstream Eclipse bundles do not list as Maven dependencies. -->
139152

140153
<!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
@@ -147,7 +160,7 @@
147160
<dependency>
148161
<groupId>org.eclipse.jdt</groupId>
149162
<artifactId>org.eclipse.jdt.core</artifactId>
150-
<version>3.30.0</version>
163+
<version>3.39.0</version>
151164
</dependency>
152165
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
153166
<!-- <dependency>

oomph/kieler-semantics-developers.setup

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@
463463
versionRange="2.7.0"/>
464464
<requirement
465465
name="org.eclipse.xtext.sdk.feature.group"
466-
versionRange="[2.34.0,2.35.0)"/>
466+
versionRange="[2.36.0,2.37.0)"/>
467467
<requirement
468468
name="org.eclipse.emf.mwe2.launcher.feature.group"/>
469469
<requirement
@@ -519,11 +519,11 @@
519519
<repositoryList
520520
name="FixedTarget">
521521
<repository
522-
url="https://download.eclipse.org/releases/2024-03"/>
522+
url="https://download.eclipse.org/releases/2024-09"/>
523523
<repository
524-
url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
524+
url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0"/>
525525
<repository
526-
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
526+
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
527527
<repository
528528
url="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
529529
<repository
@@ -539,7 +539,7 @@
539539
xsi:type="setup.p2:P2Task">
540540
<requirement
541541
name="org.eclipse.xtext.sdk.feature.group"
542-
versionRange="[2.34.0,2.35.0)"/>
542+
versionRange="[2.36.0,2.37.0)"/>
543543
<repository
544544
url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
545545
</setupTask>

0 commit comments

Comments
 (0)