Skip to content

Commit

Permalink
Merge pull request #2786 from eclipse/cd_bootstrapMWE2150release
Browse files Browse the repository at this point in the history 
[#2716] bootstrap against mwe 2.15.0 release
  • Loading branch information
@cdietrich
cdietrich committed Aug 26, 2023
2 parents 35eeb04 + 6b1cd4e commit 8951042
Show file tree
Hide file tree
Showing 27 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml
View file
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.15.0.v20230620-0840"
version="2.15.0.v20230826-1559"
label="Dummy Feature"
provider-name="Eclipse Xtext">

Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml
View file
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.15.0.v20230620-0840</version>
<version>2.15.0.v20230826-1559</version>

<properties>
<xtext-dev-bom-version>${project.parent.version}</xtext-dev-bom-version>
Expand Down
12 changes: 6 additions & 6 deletions org.eclipse.xtext.dev-bom/pom.xml
View file
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.9.0.M3</version>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe.utils</artifactId>
<version>1.9.0.M3</version>
<version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.language</artifactId>
<version>2.15.0.M3</version>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.15.0.M3</version>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.lib</artifactId>
<version>2.15.0.M3</version>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.runtime</artifactId>
<version>2.15.0.M3</version>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jdt</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ....xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</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
2 changes: 1 addition & 1 deletion ...MavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion ...e.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</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
2 changes: 1 addition & 1 deletion ...tjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion ...t.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</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
2 changes: 1 addition & 1 deletion ...zard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</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
2 changes: 1 addition & 1 deletion ...tions/mavenTychoJ17/mavenTychoJ17.parent/mavenTychoJ17.target/mavenTychoJ17.target.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion ...lipse.xtext.tests/testdata/wizard-expectations/mavenTychoJ17/mavenTychoJ17.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</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 ...ectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion ...eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</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
2 changes: 1 addition & 1 deletion ...venTychoP2J17/mavenTychoP2J17.parent/mavenTychoP2J17.target/mavenTychoP2J17.target.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion ...e.xtext.tests/testdata/wizard-expectations/mavenTychoP2J17/mavenTychoP2J17.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<properties>
<xtextVersion>unspecified</xtextVersion>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</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
4 changes: 2 additions & 2 deletions org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java
View file
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.15.0.M3";
return "2.15.0";
}

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

public String getAntlrGeneratorVersion() {
Expand Down
2 changes: 1 addition & 1 deletion ...s/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
View file
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/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.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"/>
Expand Down
2 changes: 1 addition & 1 deletion ...text.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<packaging>eclipse-plugin</packaging>

<properties>
<mwe2Version>2.15.0.M3</mwe2Version>
<mwe2Version>2.15.0</mwe2Version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion xtext-latest.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202203.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202206.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202209.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202212.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202303.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion xtext-r202306.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202308201754/"/>
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.15.0/"/>
<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
Expand Down

0 comments on commit 8951042

Please sign in to comment.