Xtext 2.30.0

eclipse · May 3, 2023 · dba26ba · dba26ba
1 parent 8d5c06e
commit dba26ba
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 73 deletions.
diff --git a/devtools/org.eclipse.xsemantics.targetplatform/xsemantics.target.target b/devtools/org.eclipse.xsemantics.targetplatform/xsemantics.target.target
@@ -22,11 +22,11 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" 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.14.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" 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.30.0/"/>
 </location>
 </locations>
 </target>
diff --git a/devtools/org.eclipse.xsemantics.workspace/Xsemantics.setup b/devtools/org.eclipse.xsemantics.workspace/Xsemantics.setup
@@ -141,50 +141,6 @@
       <requirement
           name="org.eclipse.emf.sdk.feature.group"/>
     </setupTask>
-    <setupTask
-        xsi:type="setup.p2:P2Task"
-        id="p2.mylyn"
-        label="Mylyn">
-      <requirement
-          name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.builds.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.context_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.discovery.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.gerrit.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.git.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.github.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.hudson.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.ide_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.java_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.monitor.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.pde_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.tasks.ide.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.team_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.mylyn_feature.feature.group"/>
-      <requirement
-          name="org.eclipse.egit.mylyn.feature.group"/>
-      <repository
-          url="https://download.eclipse.org/egit/github/updates"/>
-      <repository
-          url="https://download.eclipse.org/mylyn/releases/latest"/>
-      <description>Task and build connector</description>
-    </setupTask>
     <setupTask
         xsi:type="setup.p2:P2Task"
         label="Oomph Extensions">
@@ -235,22 +191,6 @@
       <repository
           url="${mwe2.site}"/>
     </setupTask>
-    <setupTask
-        xsi:type="setup.p2:P2Task"
-        id="p2.m2e"
-        label="M2E">
-      <requirement
-          name="org.sonatype.tycho.m2e.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.m2e.feature.feature.group"/>
-      <requirement
-          name="org.sonatype.m2e.buildhelper.feature.feature.group"/>
-      <repository
-          url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-tycho/0.9.0/N/LATEST"/>
-      <repository
-          url="https://repo1.maven.org/maven2/.m2e/connectors/m2eclipse-buildhelper/0.15.0/N/0.15.0.201207090124/"/>
-      <description>Maven connector</description>
-    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="git:GitCloneTask"
@@ -473,18 +413,18 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="mwe2.site"
-        value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
+        value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.14.0/"/>
     <setupTask
         xsi:type="setup:VariableTask"
         name="xtext.site"
-        value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0"/>
+        value="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.30.0"/>
     <setupTask
         xsi:type="setup.p2:P2Task"
         id="p2.org.eclipse.xtext.2.10"
         label="Xtext Releases">
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.27.0,2.28.0)"/>
+          versionRange="[2.30.0,2.31.0)"/>
       <requirement
           name="de.itemis.xtext.antlr.feature.feature.group"/>
       <repository

diff --git a/examples/org.eclipse.xsemantics.example.expressions.ui.tests/META-INF/MANIFEST.MF b/examples/org.eclipse.xsemantics.example.expressions.ui.tests/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.xsemantics.example.expressions.ui,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.core.runtime,
  org.eclipse.xtext.ui.testing,
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.xsemantics.example.expressions.ui.tests;x-internal=true
diff --git a/examples/org.eclipse.xsemantics.example.fj.ui.tests/META-INF/MANIFEST.MF b/examples/org.eclipse.xsemantics.example.fj.ui.tests/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.xsemantics.example.fj.ui,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.core.runtime,
  org.eclipse.xtext.ui.testing,
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.xsemantics.example.fj.ui.tests;x-internal=true
diff --git a/examples/org.eclipse.xsemantics.example.fjcached.ui.tests/META-INF/MANIFEST.MF b/examples/org.eclipse.xsemantics.example.fjcached.ui.tests/META-INF/MANIFEST.MF
@@ -14,6 +14,7 @@ Require-Bundle: org.eclipse.xsemantics.example.fjcached.ui,
  org.eclipse.xtext.xbase.junit,
  org.eclipse.core.runtime,
  org.eclipse.xtext.ui.testing,
- org.eclipse.ui.workbench;resolution:=optional
+ org.eclipse.ui.workbench;resolution:=optional,
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.xsemantics.example.fjcached.ui.tests;x-internal=true
diff --git a/examples/org.eclipse.xsemantics.example.lambda.ui.tests/META-INF/MANIFEST.MF b/examples/org.eclipse.xsemantics.example.lambda.ui.tests/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.xsemantics.example.lambda.ui,
  org.eclipse.core.runtime,
  org.eclipse.xtext.ui.testing,
  org.eclipse.ui.workbench;resolution:=optional,
- org.eclipse.xsemantics.example.lambda
+ org.eclipse.xsemantics.example.lambda,
+ org.eclipse.xtext.xbase.ui.testing
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.xsemantics.example.lambda.tests.util,
  org.eclipse.xsemantics.example.lambda.ui.tests;x-internal=true
diff --git a/features/org.eclipse.xsemantics.feature/feature.xml b/features/org.eclipse.xsemantics.feature/feature.xml
@@ -46,8 +46,8 @@ Contributors:
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.xtext.xbase" version="2.27.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.xtext.ui" version="2.27.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.xtext.xbase" version="2.30.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.xtext.ui" version="2.30.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.pde.ui"/>
    </requires>
 

diff --git a/releng/org.eclipse.xsemantics.parent/pom.xml b/releng/org.eclipse.xsemantics.parent/pom.xml
@@ -62,9 +62,9 @@ Contributors:
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
-		<xtext.version>2.27.0</xtext.version>
+		<xtext.version>2.30.0</xtext.version>
 		<xtextVersion>${xtext.version}</xtextVersion>
-		<mwe2Version>2.13.0</mwe2Version>
+		<mwe2Version>2.14.0</mwe2Version>
 		<platform-version>[3.9,4.0)</platform-version>
 		<fornax-oaw-m2-plugin-version>3.5.1</fornax-oaw-m2-plugin-version>