Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Eclipse 2024-09 Target Platform #122

Merged
merged 3 commits into from
Oct 22, 2024
Merged

Upgrade to Eclipse 2024-09 Target Platform #122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cfc732
build: Upgraded target platform
a-sr Oct 17, 2024
02c0795
Downgraded tycho to circumvent bumping java version
a-sr Oct 21, 2024
6ed1faf
Adjusted uber jar script for latest conflict
a-sr Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...e.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<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"/>
<repository location="https://download.eclipse.org/releases/2024-03"/>
<repository location="https://download.eclipse.org/releases/2024-09"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<!-- Required for JUnit4 Tests to be able to run -->
Expand All @@ -21,12 +21,12 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="com.google.gson" version="0.0.0"/>
<unit id="org.freemarker.freemarker" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.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.34.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</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"/>
Expand Down
8 changes: 4 additions & 4 deletions build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<!-- Language server dependency versions -->
<elk-version>0.9.1</elk-version>
<klighd-version>3.0.2.v20240507</klighd-version>
<lsp4j-version>0.22.0</lsp4j-version>
<lsp4j-version>0.23.0</lsp4j-version>
<pragmatics-version>0.51.0.v20240410</pragmatics-version>

<!-- Xtext compile dependency versions -->
<xtend-version>2.34.0</xtend-version>
<xtext-version>2.34.0</xtext-version>
<xtend-version>2.36.0</xtend-version>
<xtext-version>2.36.0</xtext-version>

<!-- Tycho -->
<tycho-version>2.7.5</tycho-version>
<tycho-version>4.0.8</tycho-version>
<tycho.disableP2Mirrors>true</tycho.disableP2Mirrors>

<!-- Java -->
Expand Down
15 changes: 14 additions & 1 deletion language-server/de.cau.cs.kieler.language.server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,19 @@
<version>${lsp4j-version}</version>
</dependency>


<!-- Somehow important -->
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
<version>3.31.100</version>
</dependency>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.19.100</version>
</dependency>

<!-- Additional dependencies that the downstream Eclipse bundles do not list as Maven dependencies. -->

<!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
Expand All @@ -147,7 +160,7 @@
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
<version>3.30.0</version>
<version>3.39.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
<!-- <dependency>
Expand Down
10 changes: 5 additions & 5 deletions oomph/kieler-semantics-developers.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@
versionRange="2.7.0"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="[2.34.0,2.35.0)"/>
versionRange="[2.36.0,2.37.0)"/>
<requirement
name="org.eclipse.emf.mwe2.launcher.feature.group"/>
<requirement
Expand Down Expand Up @@ -519,11 +519,11 @@
<repositoryList
name="FixedTarget">
<repository
url="https://download.eclipse.org/releases/2024-03"/>
url="https://download.eclipse.org/releases/2024-09"/>
<repository
url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0"/>
<repository
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
<repository
url="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
<repository
Expand All @@ -539,7 +539,7 @@
xsi:type="setup.p2:P2Task">
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="[2.34.0,2.35.0)"/>
versionRange="[2.36.0,2.37.0)"/>
<repository
url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
</setupTask>
Expand Down
Loading