Skip to content

Commit

Permalink
Merge pull request #212 from integratedmodelling/IM-473-xtext-eclipse…
Browse files Browse the repository at this point in the history 
…-upgrade

Im 473 xtext eclipse upgrade
  • Loading branch information
@iperdomo
iperdomo authored Nov 20, 2024
2 parents 52fb9a5 + 9c43181 commit 5dda3d4
Show file tree
Hide file tree
Showing 33 changed files with 73 additions and 315 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'
cache: 'maven'
- name: Build with maven
run: |
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def kmodelers = [
]

pipeline {
agent { label "klab-agent-jdk17"}
agent { label "maven-3-9-5-eclipse-temurin-21"}
options { skipDefaultCheckout(true) }
environment {
VERSION_DATE = sh(
Expand Down
6 changes: 3 additions & 3 deletions api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand All @@ -193,8 +193,8 @@
</build>
<repositories>
<repository>
<id>eclipse-2022-09</id>
<url>https://download.eclipse.org/releases/2022-09/</url>
<id>eclipse-2024-09</id>
<url>https://download.eclipse.org/releases/2024-09/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down
6 changes: 3 additions & 3 deletions client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand All @@ -193,8 +193,8 @@
</build>
<repositories>
<repository>
<id>eclipse-2022-09</id>
<url>https://download.eclipse.org/releases/2022-09/</url>
<id>eclipse-2024-09</id>
<url>https://download.eclipse.org/releases/2024-09/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down
20 changes: 11 additions & 9 deletions ...rg.integratedmodelling.klab.ide.platform/org.integratedmodelling.klab.ide.platform.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,26 @@
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.19.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xpand" version="0.0.0"/>
<unit id="org.eclipse.xtend" version="0.0.0"/>
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2024-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
<unit id="javax.annotation" version="0.0.0"/>
<unit id="javax.inject" version="0.0.0"/>
<unit id="ch.qos.logback.classic" version="0.0.0"/>
<unit id="ch.qos.logback.core" version="0.0.0"/>
<unit id="ch.qos.logback.slf4j" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://download.eclipse.org/nebula/releases/2.6.0"/>
Expand All @@ -33,13 +38,10 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.egit.gitflow.feature.feature.group" version="0.0.0"/>
<!-- <unit id="org.eclipse.egit.mylyn.feature.group" version="0.0.0"/> -->
<unit id="org.eclipse.egit.source.feature.group" version="0.0.0"/>
<!--<unit id="org.eclipse.egit.ui.smartimport" version="0.0.0"/>-->
<unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.lfs.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jgit.pgm.feature.group" version="0.0.0"/>
<!--<unit id="org.eclipse.jgit.pgm.source.feature.group" version="0.0.0"/>-->
<unit id="org.eclipse.jgit.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/egit/updates-6.3/"/>
</location>
Expand Down
6 changes: 3 additions & 3 deletions ide/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand All @@ -200,8 +200,8 @@
</build>
<repositories>
<repository>
<id>eclipse-2022-09</id>
<url>https://download.eclipse.org/releases/2022-09/</url>
<id>eclipse-2024-09</id>
<url>https://download.eclipse.org/releases/2024-09/</url>
<layout>p2</layout>
</repository>
<repository>
Expand Down
7 changes: 3 additions & 4 deletions kactors/org.integratedmodelling.kactors.target/org.integratedmodelling.kactors.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09"/>
<repository location="https://download.eclipse.org/releases/2024-09"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.19.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.generator.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</location>
</locations>
</target>
21 changes: 0 additions & 21 deletions kactors/org.integratedmodelling.kactors.tests/.classpath
View file

This file was deleted.

40 changes: 0 additions & 40 deletions kactors/org.integratedmodelling.kactors.tests/.project
View file

This file was deleted.

2 changes: 0 additions & 2 deletions kactors/org.integratedmodelling.kactors.tests/.settings/org.eclipse.core.resources.prefs
View file

This file was deleted.

10 changes: 0 additions & 10 deletions kactors/org.integratedmodelling.kactors.tests/.settings/org.eclipse.jdt.core.prefs
View file

This file was deleted.

7 changes: 0 additions & 7 deletions kactors/org.integratedmodelling.kactors.tests/.settings/org.eclipse.xtend.core.Xtend.prefs
View file

This file was deleted.

14 changes: 0 additions & 14 deletions kactors/org.integratedmodelling.kactors.tests/META-INF/MANIFEST.MF
View file

This file was deleted.

6 changes: 0 additions & 6 deletions kactors/org.integratedmodelling.kactors.tests/build.properties
View file

This file was deleted.

21 changes: 0 additions & 21 deletions kactors/org.integratedmodelling.kactors.tests/pom.xml
View file

This file was deleted.

Empty file removed kactors/org.integratedmodelling.kactors.tests/src-gen/.keep
View file
Empty file.
27 changes: 0 additions & 27 deletions ...odelling.kactors.tests/src/org/integratedmodelling/kactors/tests/KactorsParsingTest.xtend
View file

This file was deleted.

2 changes: 1 addition & 1 deletion kactors/org.integratedmodelling.kactors/model/generated/Kactors.genmodel
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.33.0" modelDirectory="/org.integratedmodelling.kactors/src-gen"
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="generated by Xtext 2.36.0" modelDirectory="/org.integratedmodelling.kactors/src-gen"
modelPluginID="org.integratedmodelling.kactors" forceOverwrite="true" modelName="Kactors"
updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29">
Expand Down
3 changes: 1 addition & 2 deletions kactors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
<module>org.integratedmodelling.kactors.target</module>
<module>org.integratedmodelling.kactors.feature</module>
<module>org.integratedmodelling.kactors.repository</module>
<module>org.integratedmodelling.kactors.tests</module>
</modules>
<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -243,7 +242,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
9 changes: 3 additions & 6 deletions kdl/org.integratedmodelling.kdl.target/org.integratedmodelling.kdl.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,15 @@
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xpand" version="0.0.0"/>
<unit id="org.eclipse.xtend" version="0.0.0"/>
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2024-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.19.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</location>
</locations>
</target>
2 changes: 1 addition & 1 deletion kdl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<execute></execute>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
9 changes: 3 additions & 6 deletions kim/org.integratedmodelling.kim.target/org.integratedmodelling.kim.target.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,15 @@
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xpand" version="0.0.0"/>
<unit id="org.eclipse.xtend" version="0.0.0"/>
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2022-09/"/>
<repository location="https://download.eclipse.org/releases/2024-09/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.19.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.36.0/"/>
</location>
</locations>
</target>
14 changes: 0 additions & 14 deletions kim/org.integratedmodelling.kim.updatesite/.classpath
View file

This file was deleted.

Loading

0 comments on commit 5dda3d4

Please sign in to comment.