Skip to content

Commit

Permalink
update to MWE 2.15.0.M1
Browse files Browse the repository at this point in the history
reexport failureaccess

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>

package more stuff
  • Loading branch information
cdietrich committed Jun 25, 2023
1 parent b87e83f commit 4459d5f
Show file tree
Hide file tree
Showing 40 changed files with 61 additions and 57 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.mwe2.language.sdk"
version="2.14.0.v20221117-1134"
version="2.15.0.v20230620-0840"
label="Dummy Feature"
provider-name="Eclipse Xtext">

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<packaging>eclipse-feature</packaging>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.language.sdk</artifactId>
<version>2.14.0.v20221117-1134</version>
<version>2.15.0.v20230620-0840</version>

<properties>
<xtext-dev-bom-version>${project.parent.version}</xtext-dev-bom-version>
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ Bundle-Vendor: Eclipse Xtext
Bundle-ClassPath: .
Require-Bundle: com.google.inject;bundle-version="7.0.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.14.0",
org.eclipse.emf.mwe2.runtime;bundle-version="2.14.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.15.0",
org.eclipse.emf.mwe2.runtime;bundle-version="2.15.0",
org.eclipse.xtend.lib,
org.eclipse.jdt.core;bundle-version="3.29.0",
org.eclipse.core.resources;bundle-version="3.16.100",
org.eclipse.core.runtime;bundle-version="3.24.100",
org.eclipse.xtend.ide.tests,
org.junit,
org.eclipse.emf.mwe.utils;bundle-version="1.8.0",
org.eclipse.emf.mwe.utils;bundle-version="1.9.0",
org.eclipse.ui.editors;bundle-version="3.14.300",
org.eclipse.xtext.builder,
org.eclipse.xtext.util,
org.eclipse.emf.mwe2.launch;bundle-version="2.14.0";resolution:=optional,
org.eclipse.emf.mwe2.launch;bundle-version="2.15.0";resolution:=optional,
org.eclipse.xtext.ui.testing
Automatic-Module-Name: org.eclipse.xtend.performance.tests
12 changes: 6 additions & 6 deletions org.eclipse.xtext.dev-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -237,32 +237,32 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe.core</artifactId>
<version>1.8.0</version>
<version>1.9.0.M1</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe.utils</artifactId>
<version>1.8.0</version>
<version>1.9.0.M1</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.language</artifactId>
<version>2.14.0</version>
<version>2.15.0.M1</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.14.0</version>
<version>2.15.0.M1</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.lib</artifactId>
<version>2.14.0</version>
<version>2.15.0.M1</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.runtime</artifactId>
<version>2.14.0</version>
<version>2.15.0.M1</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.generator/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Require-Bundle: org.eclipse.xtext.xtext.generator;visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.emf.mwe2.lib;bundle-version="2.14.0";resolution:=optional;visibility:=reexport,
org.eclipse.emf.mwe2.lib;bundle-version="2.15.0";resolution:=optional;visibility:=reexport,
org.eclipse.xtext.xbase.lib;resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.xtext.ecore,
org.eclipse.xtend.lib,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
org.eclipse.lsp4j.jsonrpc;bundle-version="[0.21.0,0.22.0)";resolution:=optional,
org.eclipse.xtext.testlanguages,
org.eclipse.xtext.testlanguages.ide,
org.eclipse.emf.mwe2.lib;bundle-version="2.14.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.15.0",
org.aopalliance;bundle-version="1.0.0",
com.google.gson;bundle-version="2.10.1"
Import-Package: org.apache.log4j;version="1.2.24"
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;bundle-version="1.8.0",
org.eclipse.emf.mwe.utils;bundle-version="1.9.0",
org.eclipse.xtext.util,
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.14.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.launch;bundle-version="2.15.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.testlanguages,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.testing,
Expand All @@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional,
org.eclipse.xtext.xbase.lib;bundle-version="2.32.0",
org.eclipse.xtext.xtext.generator,
org.eclipse.emf.mwe.core;bundle-version="1.8.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.14.0",
org.eclipse.emf.mwe.core;bundle-version="1.9.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.15.0",
org.junit;bundle-version="4.13.2",
org.aopalliance;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Expand Down
4 changes: 4 additions & 0 deletions org.eclipse.xtext.p2repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@

<bundle id="com.google.guava" version="32.0.1.qualifier"/>
<bundle id="com.google.guava.source" version="32.0.1.qualifier"/>
<bundle id="com.google.guava.failureaccess" version="1.0.1.qualifier"/>
<bundle id="com.google.guava.failureaccess.source" version="1.0.1.qualifier"/>
<bundle id="com.google.inject" version="7.0.0.qualifier"/>
<bundle id="com.google.inject.source" version="7.0.0.qualifier"/>
<bundle id="javax.inject" version="1.0.0.qualifier"/>
<bundle id="javax.inject.source" version="1.0.0.qualifier"/>
<bundle id="jakarta.inject.jakarta.inject-api" version="2.0.1.qualifier"/>
<bundle id="jakarta.inject.jakarta.inject-api.source" version="2.0.1.qualifier"/>
<bundle id="org.antlr.runtime" version="3.2.0.qualifier"/>
<bundle id="org.antlr.runtime.source" version="3.2.0.qualifier"/>
<bundle id="org.apache.log4j" version="1.2.24.qualifier"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.sdk.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ SPDX-License-Identifier: EPL-2.0
<import plugin="org.eclipse.emf.common" version="2.24.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore.source" version="2.26.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common.source" version="2.24.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.mwe2.language.sdk" version="2.14.0" match="greaterOrEqual"/>
<import feature="org.eclipse.emf.mwe2.language.sdk" version="2.15.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xtext.generator;resolution:=optional;x-installation:=greedy,
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe.utils;bundle-version="1.8.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.launch;bundle-version="2.14.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe.utils;bundle-version="1.9.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.launch;bundle-version="2.15.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.util,
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
Expand Down
8 changes: 4 additions & 4 deletions org.eclipse.xtext.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext,
org.eclipse.emf.mwe.utils;bundle-version="1.8.0",
org.eclipse.emf.mwe.utils;bundle-version="1.9.0",
org.eclipse.xtext.util,
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.14.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.launch;bundle-version="2.15.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.testlanguages,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.testing,
Expand All @@ -21,8 +21,8 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.xbase.lib;bundle-version="2.32.0",
org.eclipse.xtext.xtext.generator,
org.eclipse.xtext.xtext.wizard,
org.eclipse.emf.mwe.core;bundle-version="1.8.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.14.0",
org.eclipse.emf.mwe.core;bundle-version="1.9.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.15.0",
org.junit;bundle-version="4.13.2",
org.aopalliance;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.util/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Export-Package: org.eclipse.xtext.util;
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
com.google.guava;bundle-version="[32.0.1,33.0.0)";visibility:=reexport,
com.google.inject;bundle-version="7.0.0";visibility:=reexport,
com.google.guava.failureaccess;bundle-version="1.0.1",
com.google.guava.failureaccess;bundle-version="1.0.1";visibility:=reexport,
javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.xtend.lib
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ public String getXtextGradlePluginVersion() {
* @noreference
*/
public String getMweVersion() {
return "2.14.0";
return "2.15.0.M1";
}

/**
* @noreference
*/
public String getMweBuildNumber() {
return "";
return "S202306200840";
}

public String getAntlrGeneratorVersion() {
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;x-installation:=greedy,
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0";visibility:=reexport;x-installation:=greedy,
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.emf.mwe2.lib;bundle-version="2.14.0";resolution:=optional,
org.eclipse.emf.mwe2.lib;bundle-version="2.15.0";resolution:=optional,
org.eclipse.equinox.common;bundle-version="3.16.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</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.14.0/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202306200840/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<packaging>eclipse-plugin</packaging>

<properties>
<mwe2Version>2.14.0</mwe2Version>
<mwe2Version>2.15.0.M1</mwe2Version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xtext.ui.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SPDX-License-Identifier: EPL-2.0
optional="true"/>

<requires>
<import plugin="org.eclipse.emf.mwe2.runtime" version="2.14.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.mwe2.runtime" version="2.15.0" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.xtext.ui,
org.eclipse.ui.editors;bundle-version="3.14.300",
org.eclipse.ui;bundle-version="3.201.0",
org.eclipse.emf.mwe.core;resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.language;bundle-version="2.14.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.launch;bundle-version="2.14.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.language;bundle-version="2.15.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.mwe2.launch;bundle-version="2.15.0";resolution:=optional;x-installation:=greedy,
org.eclipse.pde.ui;bundle-version="3.13.400";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.builder,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=re
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport,
com.google.inject;bundle-version="7.0.0";visibility:=reexport,
org.objectweb.asm;bundle-version="[9.5.0,9.6.0)";resolution:=optional,
org.eclipse.emf.mwe.core;bundle-version="1.8.0";resolution:=optional;visibility:=reexport,
org.eclipse.emf.mwe.utils;bundle-version="1.8.0";resolution:=optional;visibility:=reexport,
org.eclipse.emf.mwe.core;bundle-version="1.9.0";resolution:=optional;visibility:=reexport,
org.eclipse.emf.mwe.utils;bundle-version="1.9.0";resolution:=optional;visibility:=reexport,
org.eclipse.xtend;bundle-version="2.2.0";resolution:=optional,
org.eclipse.xtend.typesystem.emf;bundle-version="2.2.0";resolution:=optional,
org.eclipse.xtext.util;visibility:=reexport,
Expand Down

0 comments on commit 4459d5f

Please sign in to comment.