feature: Switch to 2.9.x of xtext

Change-Id: I9274e101763cfe694cb7edcdbae362ff500fa2d3

4 files changed, 29 insertions, 8 deletions

diff --git a/features/org.eclipse.osee.dep.feature/feature.xml b/features/org.eclipse.osee.dep.feature/feature.xml
index a49d7ed6813..a8114cbb83b 100644
--- a/features/org.eclipse.osee.dep.feature/feature.xml
+++ b/features/org.eclipse.osee.dep.feature/feature.xml
@@ -342,8 +342,8 @@
       <import feature="org.eclipse.emf" version="2.9.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.common" version="2.9.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.xtext.runtime" version="2.8.3" match="equivalent"/>
-      <import plugin="org.eclipse.xtext.util" version="2.8.3" match="equivalent"/>
+      <import feature="org.eclipse.xtext.runtime" version="2.9.0" match="equivalent"/>
+      <import plugin="org.eclipse.xtext.util" version="2.9.0" match="equivalent"/>
       <import plugin="com.lowagie.text" version="2.0.0" match="compatible"/>
       <import plugin="org.antlr.runtime" version="4.0.0" match="greaterOrEqual"/>
    </requires>
diff --git a/features/org.eclipse.osee.x.server.external.feature/feature.xml b/features/org.eclipse.osee.x.server.external.feature/feature.xml
index 5e754f66f6d..1b978f59e47 100644
--- a/features/org.eclipse.osee.x.server.external.feature/feature.xml
+++ b/features/org.eclipse.osee.x.server.external.feature/feature.xml
@@ -46,8 +46,8 @@
       <import feature="org.eclipse.emf" version="2.9.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.common" version="2.9.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.emf.ecore" version="2.9.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.xtext.runtime" version="2.8.3" match="equivalent"/>
-      <import plugin="org.eclipse.xtext.util" version="2.8.3" match="equivalent"/>
+      <import feature="org.eclipse.xtext.runtime" version="2.9.0" match="equivalent"/>
+      <import plugin="org.eclipse.xtext.util" version="2.9.0" match="equivalent"/>
       <import plugin="com.lowagie.text" version="2.0.0" match="compatible"/>
    </requires>
 
@@ -344,5 +344,26 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+    <plugin
+         id="org.eclipse.xtend.lib"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+    <plugin
+         id="org.eclipse.xtend.lib.macro"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+     <plugin
+         id="org.eclipse.xtext.smap"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF
index 646cfecaa90..4ec5eb97bd0 100644
--- a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.osee.ats.dsl,
  org.eclipse.osee.ats.dsl.validation,
  org.eclipse.osee.ats.dsl.scoping,
  org.eclipse.osee.ats.dsl.formatting
-Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.codegen.ecore;resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.mwe.utils;resolution:=optional;x-installation:=greedy,
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib;bundle-version="2.3.0"
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.commons.logging,
  org.apache.log4j;version="1.2.15",
  org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
index 619d1afe61b..f49c516c5b9 100644
--- a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Version: 0.24.0.qualifier
 Bundle-Vendor: Eclipse Open System Engineering Environment
 Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl;singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.codegen.ecore;resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.mwe.utils;resolution:=optional;x-installation:=greedy,
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport,
  org.eclipse.emf.common,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.common.types,
- org.eclipse.xtext.xbase.lib;bundle-version="2.3.0"
+ org.eclipse.xtext.xbase.lib
 Import-Package: org.apache.commons.logging,
  org.apache.log4j;version="1.2.15",
  org.eclipse.osee.framework.jdk.core.util,