Merge pull request sebastianbenz#31 from tisis2/issue#30_moveToXText2.12

Issue#30 move to x text2.12
ghaith · Jun 20, 2017 · a5a34de · a5a34de
2 parents bd72116 + 1595fa2
commit a5a34de
Show file tree

Hide file tree

Showing 24 changed files with 722 additions and 663 deletions.
diff --git a/Jnario.setup b/Jnario.setup
diff --git a/examples/org.jnario.maven.example/pom.xml b/examples/org.jnario.maven.example/pom.xml
@@ -5,7 +5,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-		<xtend.version>2.11.0</xtend.version>
+		<xtend.version>2.12.0</xtend.version>
 		<jnario.version>1.1.1-SNAPSHOT</jnario.version> <!--Jnario Version-->
 	</properties>
 	<modelVersion>4.0.0</modelVersion>

diff --git a/features/org.jnario-feature/feature.xml b/features/org.jnario-feature/feature.xml
@@ -29,12 +29,12 @@ http://www.eclipse.org/legal/epl-v10.html Description here.
       <import plugin="org.apache.log4j"/>
       <import plugin="org.apache.commons.logging"/>
       <import plugin="org.eclipse.jdt.core" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext" version="2.11.0" match="equivalent"/>
+      <import plugin="org.eclipse.xtext" version="2.12.0" match="equivalent"/>
       <import plugin="org.apache.commons.lang"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.11.0" match="equivalent"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.12.0" match="equivalent"/>
       <import plugin="org.hamcrest.core"/>
-      <import plugin="org.eclipse.xtext.xbase" version="2.11.0" match="equivalent"/>
-      <import plugin="org.eclipse.xtend.core" version="2.11.0" match="equivalent"/>
+      <import plugin="org.eclipse.xtext.xbase" version="2.12.0" match="equivalent"/>
+      <import plugin="org.eclipse.xtend.core" version="2.12.0" match="equivalent"/>
       <import plugin="org.objectweb.asm" version="3.2.0" match="greaterOrEqual"/>
    </requires>
 

diff --git a/features/org.jnario.ui-feature/feature.xml b/features/org.jnario.ui-feature/feature.xml
@@ -22,23 +22,23 @@ http://www.eclipse.org/legal/epl-v10.html Description here.
    </license>
 
    <requires>
-      <import plugin="org.eclipse.xtext.ui" version="2.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.ui" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.editors"/>
       <import plugin="org.eclipse.xtext.ui.shared"/>
       <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.xtext.builder" version="2.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.builder" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.antlr.runtime"/>
-      <import plugin="org.eclipse.xtext.common.types.ui" version="2.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.common.types.ui" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.xtext.ui.codetemplates.ui"/>
       <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.xtext.xbase.ui" version="2.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.ui" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.junit"/>
       <import plugin="org.eclipse.pde.ui"/>
       <import plugin="org.jnario" version="1.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.core" match="greaterOrEqual"/>
       <import plugin="org.eclipse.debug.ui" match="greaterOrEqual"/>
       <import plugin="org.jnario.feature" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.xtext.xbase.lib" version="2.11.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.xtext.xbase.lib" version="2.12.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.jdt.ui"/>
       <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.apache.commons.logging"/>

diff --git a/plugins/jnario-maven-plugin/pom.xml b/plugins/jnario-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-		<xtext.version>2.11.0</xtext.version>
+		<xtext.version>2.12.0</xtext.version>
 		<version.maven>3.2.1</version.maven>
 	</properties>
 	<repositories>

diff --git a/plugins/jnario-maven-report-plugin/pom.xml b/plugins/jnario-maven-report-plugin/pom.xml
@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-		<xtext.version>2.9.0</xtext.version>
+		<xtext.version>2.12.0</xtext.version>
 	</properties>
 	<repositories>
 		<repository>

diff --git a/plugins/org.jnario.feature.ui/META-INF/MANIFEST.MF b/plugins/org.jnario.feature.ui/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.jnario.feature.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.11.0,2.12.0)",
+Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.ui.editors,
  org.eclipse.ui.ide,
  org.eclipse.xtext.ui.shared,
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.11.0,2.12.0)",
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  org.jnario.feature,
- org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
  org.eclipse.jdt.ui,
  org.eclipse.jdt.core,

diff --git a/plugins/org.jnario.feature/META-INF/MANIFEST.MF b/plugins/org.jnario.feature/META-INF/MANIFEST.MF
@@ -6,17 +6,17 @@ Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.jnario.feature;singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.12.0)";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.12.0)";resolution:=optional;visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.13.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.13.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.util;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.13.0)",
  org.jnario.lib,
  org.jnario;bundle-version="1.0.0",
  org.eclipse.xtext.xbase.lib,

diff --git a/plugins/org.jnario.lib/META-INF/MANIFEST.MF b/plugins/org.jnario.lib/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Export-Package: org.jnario.junit3,
  org.jnario.lib.internal;x-friends:="org.jnario.lib.tests",
  org.jnario.runner,
  org.jnario.runner.internal;x-friends:="org.jnario.lib.tests"
-Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.12.0)";visibility:=reexport
+Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.13.0)";visibility:=reexport
 Import-Package: junit.extensions,
  junit.framework,
  junit.runner,

diff --git a/plugins/org.jnario.m2e/META-INF/MANIFEST.MF b/plugins/org.jnario.m2e/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.m2e.core;bundle-version="1.0.0";resolution:=optional,
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.equinox.registry;bundle-version="3.4.0",
- org.eclipse.xtext.ui;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.m2e.maven.runtime;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.xtext.builder;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.11.0,2.13.0)",
  org.jnario;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.jnario.spec.ui/META-INF/MANIFEST.MF b/plugins/org.jnario.spec.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.jnario.spec;visibility:=reexport,
  org.eclipse.jdt.ui,
  com.ibm.icu,
  org.jnario.ui;bundle-version="1.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.13.0)",
  org.jnario.lib;bundle-version="1.0.0",
  org.eclipse.jdt.junit.runners;bundle-version="0.1.0";resolution:=optional,
  org.eclipse.jdt.debug.ui,

diff --git a/plugins/org.jnario.spec/META-INF/MANIFEST.MF b/plugins/org.jnario.spec/META-INF/MANIFEST.MF
@@ -6,20 +6,20 @@ Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: org.jnario.spec; singleton:=true
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.12.0)";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.12.0)";resolution:=optional;visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.13.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.13.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
  org.eclipse.emf.mwe2.launch;resolution:=optional,
- org.eclipse.xtext.util;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.util;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.13.0)",
  org.jnario.lib;bundle-version="1.0.0",
  org.jnario;bundle-version="1.0.0",
- org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
  org.apache.commons.lang,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,

diff --git a/plugins/org.jnario.standalone.maven/pom.xml b/plugins/org.jnario.standalone.maven/pom.xml
@@ -11,7 +11,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
     <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-    <xtext.version>2.9.0</xtext.version>
+    <xtext.version>2.12.0</xtext.version>
   </properties>
   <repositories>
     <repository>

diff --git a/plugins/org.jnario.standalone/META-INF/MANIFEST.MF b/plugins/org.jnario.standalone/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.1.1.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.12.0)",
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.jdt.core,
  org.jnario.feature;bundle-version="1.0.0",
  org.jnario;bundle-version="1.0.0",

diff --git a/plugins/org.jnario.ui/META-INF/MANIFEST.MF b/plugins/org.jnario.ui/META-INF/MANIFEST.MF
@@ -6,19 +6,19 @@ Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: BWM Car IT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.resources,
- org.eclipse.xtext.builder;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.jdt.core,
  org.eclipse.core.runtime,
- org.eclipse.xtext.ui;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.11.0,2.13.0)",
  org.jnario;bundle-version="1.0.0",
- org.eclipse.xtext.common.types.ui;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.common.types.ui;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.jdt.ui,
- org.eclipse.xtext.xbase.ui;bundle-version="[2.11.0,2.12.0)",
+ org.eclipse.xtext.xbase.ui;bundle-version="[2.11.0,2.13.0)",
  org.jnario.lib;bundle-version="1.0.0",
  org.eclipse.ui,
  org.eclipse.jdt.junit,
- org.eclipse.xtext.ui.shared;bundle-version="[2.11.0,2.12.0)",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.11.0,2.12.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.11.0,2.13.0)",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.11.0,2.13.0)";visibility:=reexport,
  org.eclipse.jdt.junit.runners;bundle-version="0.1.0";resolution:=optional,
  org.jnario.xbase.richstring.ui
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.jnario/META-INF/MANIFEST.MF b/plugins/org.jnario/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.apache.commons.logging,
  org.apache.log4j,
  org.eclipse.jdt.core.compiler.batch
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.12.0)",
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.13.0)",
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.xtext.common.types;visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.12.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.13.0)";visibility:=reexport,
  org.jnario.lib,
  org.eclipse.emf.mwe2.lib;resolution:=optional,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)",
@@ -35,7 +35,6 @@ Export-Package: org.jnario,
  org.jnario.linking,
  org.jnario.macro,
  org.jnario.report,
- org.jnario.resource,
  org.jnario.scoping,
  org.jnario.typing,
  org.jnario.util,