Skip to content

Commit

Permalink
Xtext 2.34.0 and MWE2 1.17.0
Browse files Browse the repository at this point in the history
  • Loading branch information
LorenzoBettini committed Feb 27, 2024
1 parent 8edf4f3 commit e8d191c
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
17 changes: 9 additions & 8 deletions DEVELOPMENT.md
@@ -1,16 +1,17 @@
# Development Eclipse EMF Parsley

## Update to a new Eclipse release and Xtext release
## Update to a new Eclipse release

* Update the Oomph file `devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup`: add another target platform node, e.g., "2024-03" (copying the latest existing one), for the current Eclipse release, in "Modular Target" both for "RCP" and "RAP".
* Update the Oomph file `org.eclipse.emf.parsley.oomph/EMFParsley.setup`: add another target platform node, e.g., "2024-03" (copying the latest existing one), for the current Eclipse release, in "Modular Target" both for "RCP" and "RAP".
* In that new node for the target platform update the URL of the Eclipse releases and the Orbit update site (e.g., https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03).
* Change the default value of `eclipse.target.platform` to the new target platform
* Run the Oomph workflow (when run from Eclipse already Oomphed, change the Target Plarform to the latest one).

## Update the `.target` files
## Update to a new Xtext release

Both the `simrel.target` and `simrel-rap.target` in `org.eclipse.emf.parsley.targetplatform` with the URL of the Eclipse releases and the Orbit update site (e.g., https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03).

## Update the parent `pom.xml`

Update the property `<eclipse-version>2023-12</eclipse-version>`.
* Update the Oomph file `org.eclipse.emf.parsley.oomph/EMFParsley.setup`: replace the Xtext and MWE2 update sites in the corresponding properties (`xtext.site` and`mwe2.site`). Change the Xtext version range in "master / P2 Directory / Xtext Releases".
* Update the Xtext version in `/org.eclipse.emf.parsley.workspace/feature.xml`.
* Update the Xtext version in `/org.eclipse.emf.parsley.dsl.feature/feature.xml`.
* Update the `.target` files: Both the `simrel.target` and `simrel-rap.target` in `org.eclipse.emf.parsley.targetplatform` with the URL of the Xtext and MWE2 update sites.
* Update the properties for Xtext and MWE2 in the parent POM.
* Run the Oomph workflow.
6 changes: 3 additions & 3 deletions devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
Expand Up @@ -153,11 +153,11 @@
<setupTask
xsi:type="setup:VariableTask"
name="mwe2.site"
value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.16.0"/>
value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.17.0"/>
<setupTask
xsi:type="setup:VariableTask"
name="xtext.site"
value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/>
value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0"/>
<setupTask
xsi:type="setup:VariableTask"
name="api.baseline.version"
Expand Down Expand Up @@ -624,7 +624,7 @@
licenseConfirmationDisabled="true">
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="[2.33.0,2.34.0)"/>
versionRange="[2.34.0,2.35.0)"/>
<requirement
name="de.itemis.xtext.antlr.feature.feature.group"/>
<repository
Expand Down
Expand Up @@ -30,7 +30,7 @@
<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
<unit id="org.junit" version="0.0.0"/>
<unit id="org.objectweb.asm" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0"/>
</location>
</locations>
</target>
6 changes: 3 additions & 3 deletions devtools/org.eclipse.emf.parsley.targetplatform/simrel.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>

<target name="simrel" sequenceNumber="5">
<target name="simrel" sequenceNumber="6">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
Expand All @@ -19,11 +19,11 @@
</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.16.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.17.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.33.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="de.itemis.xtext.antlr.feature.feature.group" version="2.1.1.v201405091103"/>
Expand Down
2 changes: 1 addition & 1 deletion devtools/org.eclipse.emf.parsley.workspace/feature.xml
Expand Up @@ -18,7 +18,7 @@
</license>

<requires>
<import feature="org.eclipse.xtext.sdk" version="2.33.0" match="greaterOrEqual"/>
<import feature="org.eclipse.xtext.sdk" version="2.34.0" match="greaterOrEqual"/>
<import feature="org.eclipse.swtbot.eclipse" version="2.5.0.201609021837"/>
<import feature="org.eclipse.swtbot.ide" version="2.5.0.201609021837"/>
</requires>
Expand Down
4 changes: 2 additions & 2 deletions features/org.eclipse.emf.parsley.dsl.feature/feature.xml
Expand Up @@ -23,8 +23,8 @@ It aims at providing a set of Components like Trees, Tables and Detail Forms tha
</license>

<requires>
<import feature="org.eclipse.xtext.xbase" version="2.33.0" match="greaterOrEqual"/>
<import feature="org.eclipse.xtext.ui" version="2.33.0" match="greaterOrEqual"/>
<import feature="org.eclipse.xtext.xbase" version="2.34.0" match="greaterOrEqual"/>
<import feature="org.eclipse.xtext.ui" version="2.34.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
4 changes: 2 additions & 2 deletions releng/org.eclipse.emf.parsley.parent/pom.xml
Expand Up @@ -65,9 +65,9 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>

<xtext-version>2.33.0 </xtext-version>
<xtext-version>2.34.0 </xtext-version>
<xtextVersion>${xtext-version}</xtextVersion>
<mwe2Version>2.16.0</mwe2Version>
<mwe2Version>2.17.0</mwe2Version>
<eclipse-version>2024-03</eclipse-version>

<!-- tests and runtime args -->
Expand Down

0 comments on commit e8d191c

Please sign in to comment.