Xtext 2.36.0 milestone and 2024-09

eclipse-emf-parsley · Jul 10, 2024 · d77e13c · d77e13c
1 parent 8912313
commit d77e13c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 60 deletions.
diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -148,16 +148,16 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2024-06"
+      defaultValue="2024-09"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup:VariableTask"
       name="mwe2.site"
-      value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.18.0/"/>
+      value="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202407051027/"/>
   <setupTask
       xsi:type="setup:VariableTask"
       name="xtext.site"
-      value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.35.0/"/>
+      value="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.36.0.M1/"/>
   <setupTask
       xsi:type="setup:VariableTask"
       name="api.baseline.version"
@@ -281,6 +281,8 @@
             name="org.eclipse.swtbot.ide.feature.group"/>
         <requirement
             name="org.eclipse.swtbot.generator.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/swtbot/releases/latest"/>
         <description>UI testing framework</description>
       </setupTask>
       <setupTask
@@ -406,64 +408,26 @@
             rootFolder="${git.clone.location}"
             locateNestedProjects="true"/>
         <repositoryList
-            name="2022-12">
-          <repository
-              url="${xtext.site}"/>
-          <repository
-              url="${mwe2.site}"/>
-          <repository
-              url="https://download.eclipse.org/releases/2022-12"/>
-          <repository
-              url="https://download.eclipse.org/cbi/updates/license"/>
-          <repository
-              url="https://download.itemis.com/updates/releases/2.1.1/"/>
-          <repository
-              url="https://lorenzobettini.github.io/xtext-xdoc-releases/"/>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/2022-12"/>
-          <repository
-              url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-        </repositoryList>
-        <repositoryList
-            name="2023-09">
-          <repository
-              url="${xtext.site}"/>
-          <repository
-              url="${mwe2.site}"/>
-          <repository
-              url="https://download.eclipse.org/releases/2023-09"/>
-          <repository
-              url="https://download.eclipse.org/cbi/updates/license"/>
-          <repository
-              url="https://download.itemis.com/updates/releases/2.1.1/"/>
-          <repository
-              url="https://lorenzobettini.github.io/xtext-xdoc-releases/"/>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09/"/>
-          <repository
-              url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
-        </repositoryList>
-        <repositoryList
-            name="2023-12">
+            name="2024-03">
           <repository
               url="${xtext.site}"/>
           <repository
               url="${mwe2.site}"/>
           <repository
-              url="https://download.eclipse.org/releases/2023-12"/>
+              url="https://download.eclipse.org/releases/2024-03"/>
           <repository
               url="https://download.eclipse.org/cbi/updates/license"/>
           <repository
               url="https://download.itemis.com/updates/releases/2.1.1/"/>
           <repository
               url="https://lorenzobettini.github.io/xtext-xdoc-releases/"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12/"/>
+              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
           <repository
               url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
         </repositoryList>
         <repositoryList
-            name="2024-03">
+            name="2024-06">
           <repository
               url="${xtext.site}"/>
           <repository
@@ -477,12 +441,12 @@
           <repository
               url="https://lorenzobettini.github.io/xtext-xdoc-releases/"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03"/>
+              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
           <repository
               url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
         </repositoryList>
         <repositoryList
-            name="2024-06">
+            name="2024-09">
           <repository
               url="${xtext.site}"/>
           <repository
@@ -496,9 +460,11 @@
           <repository
               url="https://lorenzobettini.github.io/xtext-xdoc-releases/"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
+              url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
           <repository
               url="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
+          <repository
+              url="https://download.eclipse.org/technology/swtbot/releases/latest"/>
         </repositoryList>
       </targlet>
     </setupTask>
@@ -641,7 +607,7 @@
           licenseConfirmationDisabled="true">
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"
-            versionRange="[2.35.0,2.36.0)"/>
+            versionRange="[2.36.0,2.37.0)"/>
         <requirement
             name="de.itemis.xtext.antlr.feature.feature.group"/>
         <repository

diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/simrel-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/simrel-rap.target
@@ -17,7 +17,7 @@
 <unit id="org.eclipse.rap.sdk.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rap.examples.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2024-06/"/>
+<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.xtext.xbase.lib.feature.group" version="0.0.0"/>
@@ -29,7 +29,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/milestones/2.35.0.M0/"/>
+<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.36.0.M1/"/>
 </location>
 </locations>
 </target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/simrel.target b/devtools/org.eclipse.emf.parsley.targetplatform/simrel.target
@@ -10,7 +10,7 @@
 <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2024-06"/>
+<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.swtbot.forms.feature.group" version="0.0.0"/>
@@ -21,21 +21,21 @@
 </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.18.0/"/>
+<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202407051027/"/>
 </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.35.0/"/>
+<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.36.0.M1/"/>
 </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"/>
 <repository location="https://download.itemis.com/updates/releases/2.1.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.mockito.mockito-core" version="5.12.0"/>
-<unit id="net.bytebuddy.byte-buddy-agent" version="1.14.16"/>
+<unit id="net.bytebuddy.byte-buddy-agent" version="0.0.0"/>
 <unit id="slf4j.api" version="2.0.13"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
 </location>
 </locations>
 </target>
diff --git a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
@@ -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.35.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.xtext.ui" version="2.35.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.xtext.xbase" version="2.36.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.xtext.ui" version="2.36.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -65,9 +65,9 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 
-		<xtext-version>2.35.0</xtext-version>
+		<xtext-version>2.36.0.M1</xtext-version>
 		<xtextVersion>${xtext-version}</xtextVersion>
-		<mwe2Version>2.18.0</mwe2Version>
+		<mwe2Version>2.19.0.M1</mwe2Version>
 		<eclipse-version>2024-06</eclipse-version>
 
 		<!-- tests and runtime args -->