Starting the transition to xtext 2.8.4

sarl · Aug 25, 2015 · b9203de · b9203de
1 parent ff011a3
commit b9203de
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 52 deletions.
diff --git a/features/io.sarl.lang.sdk/feature.xml b/features/io.sarl.lang.sdk/feature.xml
@@ -224,7 +224,7 @@ integrated tools for the Eclipse IDE.
 
    <requires>
       <import plugin="io.sarl.lang.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.mwe2.launch" version="2.7.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.mwe2.launch" version="2.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.osgi" version="3.10.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore" version="2.10.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common" version="2.10.1" match="greaterOrEqual"/>
@@ -239,18 +239,18 @@ integrated tools for the Eclipse IDE.
       <import plugin="org.eclipse.jdt.debug.ui" version="3.6.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.doc.user" version="3.10.1" match="greaterOrEqual"/>
       <import plugin="javax.inject"/>
-      <import plugin="org.eclipse.xtext.xbase" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.generator" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.util" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui.shared" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.ui" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.builder" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.common.types.ui" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.generator" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.util" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.common.types" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui.shared" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.ui" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.builder" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.common.types.ui" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.8.4" match="greaterOrEqual"/>
    </requires>
 
    <plugin

diff --git a/features/io.sarl.sdk/feature.xml b/features/io.sarl.sdk/feature.xml
@@ -224,9 +224,9 @@
    <requires>
       <import plugin="io.sarl.lang.ui" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="io.sarl.lang.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.ui" version="2.8.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.builder" version="2.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.8.4" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.builder" version="2.8.4" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.ide" version="3.10.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.navigator" version="3.5.401" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.ui" version="3.10.2" match="greaterOrEqual"/>
@@ -236,7 +236,7 @@
       <import plugin="org.eclipse.core.filesystem" version="1.4.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.debug.ui" version="3.6.300" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.variables" version="3.2.800" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.8.1" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.8.4" match="greaterOrEqual"/>
       <import plugin="io.sarl.eclipse" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.m2e.core" version="1.5.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.m2e.maven.runtime" version="1.5.1" match="greaterOrEqual"/>

diff --git a/plugins/io.sarl.core/META-INF/MANIFEST.MF b/plugins/io.sarl.core/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Name: %Bundle-Name
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: io.sarl.lang.core;bundle-version="1.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.1"
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.4"
 Export-Package: io.sarl.core
diff --git a/plugins/io.sarl.eclipse/META-INF/MANIFEST.MF b/plugins/io.sarl.eclipse/META-INF/MANIFEST.MF
@@ -8,9 +8,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.sarl.lang.ui;bundle-version="1.0.0",
  io.sarl.lang.core;bundle-version="1.0.0",
- org.eclipse.xtext.xbase;bundle-version="2.8.1",
- org.eclipse.xtext.ui;bundle-version="2.8.1",
- org.eclipse.xtext.builder;bundle-version="2.8.1",
+ org.eclipse.xtext.xbase;bundle-version="2.8.4",
+ org.eclipse.xtext.ui;bundle-version="2.8.4",
+ org.eclipse.xtext.builder;bundle-version="2.8.4",
  org.eclipse.ui.ide;bundle-version="3.10.2",
  org.eclipse.ui.navigator;bundle-version="3.5.401",
  org.eclipse.jdt.ui;bundle-version="3.10.2",

diff --git a/plugins/io.sarl.eclipse/plugin.xml b/plugins/io.sarl.eclipse/plugin.xml
@@ -245,9 +245,6 @@
                 name="appName"
                 value="%product.name">
           </property>
-          <property
-                name="preferenceCustomization"
-                value="plugin_customization.ini"/>
        </product>
     </extension>
 

diff --git a/plugins/io.sarl.lang.core/META-INF/MANIFEST.MF b/plugins/io.sarl.lang.core/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Export-Package: io.sarl.lang.annotation,
  io.sarl.lang.scoping.batch,
  io.sarl.lang.util
 Import-Package: javax.inject
-Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.8.1"
+Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.8.4"
 
diff --git a/plugins/io.sarl.lang.ui/META-INF/MANIFEST.MF b/plugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
@@ -6,18 +6,18 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: io.sarl.lang.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.sarl.lang;bundle-version="1.0.0";visibility:=reexport,
- org.eclipse.xtext.ui;bundle-version="2.8.1",
- org.eclipse.xtext.ui.shared;bundle-version="2.8.1",
- org.eclipse.xtext.xbase.ui;bundle-version="2.8.1",
- org.eclipse.xtext.builder;bundle-version="2.8.1",
- org.eclipse.xtext.common.types.ui;bundle-version="2.8.1",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.8.1",
+ org.eclipse.xtext.ui;bundle-version="2.8.4",
+ org.eclipse.xtext.ui.shared;bundle-version="2.8.4",
+ org.eclipse.xtext.xbase.ui;bundle-version="2.8.4",
+ org.eclipse.xtext.builder;bundle-version="2.8.4",
+ org.eclipse.xtext.common.types.ui;bundle-version="2.8.4",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.8.4",
  org.eclipse.compare;bundle-version="3.5.501",
  org.eclipse.jdt.core;bundle-version="3.10.2",
  org.eclipse.jdt.ui;bundle-version="3.10.2",
  org.eclipse.ui.editors;bundle-version="3.8.200",
  org.eclipse.ui;bundle-version="3.106.1",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.1",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.4",
  org.antlr.runtime;bundle-version="3.2.0",
  org.eclipse.jdt.debug.ui;bundle-version="3.6.300",
  org.eclipse.jdt.doc.user;bundle-version="3.10.1"

diff --git a/plugins/io.sarl.lang/META-INF/MANIFEST.MF b/plugins/io.sarl.lang/META-INF/MANIFEST.MF
@@ -6,17 +6,17 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-SymbolicName: io.sarl.lang; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.sarl.lang.core;bundle-version="1.0.0",
- org.eclipse.xtext.xbase;bundle-version="2.8.1",
- org.eclipse.xtext.generator;bundle-version="2.8.1",
- org.eclipse.emf.mwe2.launch;bundle-version="2.7.1",
+ org.eclipse.xtext.xbase;bundle-version="2.8.4",
+ org.eclipse.xtext.generator;bundle-version="2.8.4",
+ org.eclipse.emf.mwe2.launch;bundle-version="2.8.1",
  org.eclipse.osgi;bundle-version="3.10.2",
- org.eclipse.xtext;bundle-version="2.8.1",
- org.eclipse.xtext.util;bundle-version="2.8.1",
+ org.eclipse.xtext;bundle-version="2.8.4",
+ org.eclipse.xtext.util;bundle-version="2.8.4",
  org.eclipse.emf.ecore;bundle-version="2.10.2",
  org.eclipse.emf.common;bundle-version="2.10.1",
- org.eclipse.xtext.xbase.lib;bundle-version="2.8.1",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.4",
  org.antlr.runtime;bundle-version="3.2.0",
- org.eclipse.xtext.common.types;bundle-version="2.8.1",
+ org.eclipse.xtext.common.types;bundle-version="2.8.4",
  org.objectweb.asm;bundle-version="5.0.1";resolution:=optional
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/plugins/io.sarl.m2e/META-INF/MANIFEST.MF b/plugins/io.sarl.m2e/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Require-Bundle: io.sarl.eclipse;bundle-version="1.0.0",
  io.sarl.lang.ui;bundle-version="1.0.0",
- org.eclipse.xtext.ui;bundle-version="2.8.1",
- org.eclipse.xtext.builder;bundle-version="2.8.1",
+ org.eclipse.xtext.ui;bundle-version="2.8.4",
+ org.eclipse.xtext.builder;bundle-version="2.8.4",
  org.eclipse.m2e.core;bundle-version="1.5.1",
  org.eclipse.m2e.maven.runtime;bundle-version="1.5.1",
  org.eclipse.m2e.jdt;bundle-version="1.5.1",

diff --git a/pom.xml b/pom.xml
@@ -27,8 +27,8 @@
 		<maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
 		<buildId>${maven.build.timestamp}</buildId>
 		<!-- Version of the Xtext API -->
-		<xtext.version>2.8.1</xtext.version>
-		<xtext.versionRange>[2.8.1,2.8.2)</xtext.versionRange>
+		<xtext.version>2.8.4</xtext.version>
+		<xtext.versionRange>[2.8.4,2.8.5)</xtext.versionRange><!-- For generating a correct version range you need to create a range integrating ONLY the current version and excluding all other possible versions especially the greater ones-->
 		<!-- Version of the Jnario PI -->
 		<jnario.version>1.0.0</jnario.version>
 		<jnario.report.version>1.0.1</jnario.report.version>

diff --git a/releng/io.sarl.lang.targetplatform/io.sarl.lang.targetplatform.target b/releng/io.sarl.lang.targetplatform/io.sarl.lang.targetplatform.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="io.sarl.lang.targetplatform" sequenceNumber="35">
+<?pde version="3.8"?><target includeMode="feature" name="io.sarl.lang.targetplatform" sequenceNumber="36">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.jdt.feature.group" version="3.10.1.v20150204-1700"/>
@@ -14,13 +14,13 @@
 <repository location="http://powermock-osgi.googlecode.com/svn/updateSite/1.5.4.1"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.xtext.redist.feature.group" version="2.8.1.v201503230617"/>
-<unit id="org.eclipse.xtend.sdk.feature.group" version="2.8.1.v201503230617"/>
-<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.jboss.tools.m2e.jdt.feature.feature.group" version="1.0.1.201209200903"/>
 <repository location="http://download.jboss.org/jbosstools/updates/m2e-extensions/m2e-jdt-compiler/"/>
 </location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtend.sdk.feature.group" version="2.8.4.v201508050135"/>
+<unit id="org.eclipse.xtext.redist.feature.group" version="2.8.4.v201508050135"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
+</location>
 </locations>
 </target>
diff --git a/releng/io.sarl.lang.updatesite/io.sarl.lang.product b/releng/io.sarl.lang.updatesite/io.sarl.lang.product
@@ -252,8 +252,8 @@
    <features>
       <feature id="io.sarl.lang.sdk" version="1.0.0.qualifier"/>
       <feature id="io.sarl.sdk" version="1.0.0.qualifier"/>
-      <feature id="org.eclipse.xtend.sdk" version="2.8.1.v201503230617"/>
-      <feature id="org.eclipse.xtext.redist" version="2.8.1.v201503230617"/>
+      <feature id="org.eclipse.xtend.sdk" version="2.8.4.v201508050135"/>
+      <feature id="org.eclipse.xtext.redist" version="2.8.4.v201508050135"/>
       <feature id="org.eclipse.platform" version="4.4.2.v20150204-1700"/>
       <feature id="org.eclipse.m2e.feature" version="1.5.1.20150109-1820"/>
       <feature id="org.eclipse.jgit" version="3.4.2.201412180340-r"/>

diff --git a/tycho-parent/pom.xml b/tycho-parent/pom.xml
@@ -19,7 +19,7 @@
 	<!-- ======================================= -->
 
 	<properties>
-		<tycho.version>0.22.0</tycho.version>
+		<tycho.version>0.23.1</tycho.version>
 		<jre.environment>JavaSE-1.7</jre.environment>
 	</properties>