Updated Jnario Setup and Xtext dependency versions

Jnario.setup

@@ -3,15 +3,13 @@
     xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
     xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
     xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
-    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
     name="jnario"
     label="Jnario">
   <setupTask
@@ -20,13 +18,6 @@
       location="${jre.location-1.8}">
     <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-Xmx"
-      value="2g"
-      vm="true">
-    <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
-  </setupTask>
   <setupTask
       xsi:type="setup:ResourceCreationTask"
       excludedTriggers="STARTUP MANUAL"
@@ -38,7 +29,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="Neon"
+      defaultValue="2019-12"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup.p2:P2Task">
@@ -47,84 +38,58 @@
     <requirement
         name="org.eclipse.xtext.sdk.feature.group"/>
     <repository
-        url="http://download.eclipse.org/releases/neon"/>
+        url="http://download.eclipse.org/releases/2019-12"/>
+    <repository
+        url="http://download.eclipse.org/cbi/updates/license"/>
     <repository
-        url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/"/>
+        url="http://www.xpect-tests.org/updatesite/nightly/"/>
     <repository
-        url="http://download.eclipse.org/releases/oxygen"/>
+        url="https://download.eclipse.org/tools/orbit/downloads/2019-12"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
   </setupTask>
-  <setupTask
-      xsi:type="git:GitCloneTask"
-      id="jnario.git.clone"
-      location="${jnario.git.location}"
-      remoteURI="https://github.com/riederm/Jnario.git"
-      pushURI="https://github.com/riederm/Jnario.git">
-    <description>${scope.project.label}</description>
-  </setupTask>
   <setupTask
       xsi:type="setup.targlets:TargletTask">
     <targlet
         name="${scope.project.label}"
-        activeRepositoryList="${eclipse.target.platform}">
+        activeRepositoryList="Repo">
       <requirement
-          name="org.eclipse.sdk.feature.group"/>
-      <requirement
-          name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.12.0,2.14.0)"/>
+          name="org.eclipse.jdt.junit.runners.feature.feature.group"/>
       <requirement
-          name="org.eclipse.xtend.sdk.feature.group"
-          versionRange="[2.12.0,2.14.0)"/>
+          name="org.xpect.sdk.feature.group"/>
       <requirement
-          name="org.objectweb.asm"/>
+          name="org.xpect.xtext.lib.feature.feature.group"/>
       <requirement
-          name="org.hamcrest.core"/>
+          name="org.xpect.xtext.xbase.lib.feature.feature.group"/>
       <requirement
-          name="org.hamcrest.text"/>
+          name="org.eclipse.xtend.sdk.feature.group"/>
       <requirement
-          name="org.hamcrest"/>
+          name="org.objectweb.asm"/>
       <requirement
-          name="org.objectweb.asm.analysis"/>
+          name="org.eclipse.xtext.sdk.feature.group"/>
       <requirement
           name="org.mockito"/>
       <requirement
           name="org.objenesis"/>
       <requirement
-          name="org.eclipse.jdt.junit.runners.feature.feature.group"/>
+          name="org.hamcrest"/>
       <requirement
-          name="org.xpect.sdk.feature.group"/>
+          name="org.hamcrest.core"/>
       <requirement
-          name="org.xpect.xtext.lib.feature.feature.group"/>
+          name="org.hamcrest.text"/>
       <requirement
-          name="org.xpect.xtext.xbase.lib.feature.feature.group"/>
-      <sourceLocator
-          rootFolder="${git.clone.location}"
-          locateNestedProjects="true"/>
+          name="org.eclipse.m2e.core"/>
+      <requirement
+          name="org.eclipse.sdk.feature.group"/>
       <repositoryList
-          name="Neon">
+          name="Repo">
         <repository
-            url="http://download.eclipse.org/releases/neon"/>
+            url="http://download.eclipse.org/releases/2019-12"/>
         <repository
             url="http://download.eclipse.org/cbi/updates/license"/>
-        <repository
-            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-        <repository
-            url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/"/>
         <repository
             url="http://www.xpect-tests.org/updatesite/nightly/"/>
-      </repositoryList>
-      <repositoryList
-          name="Oxygen">
-        <repository
-            url="http://download.eclipse.org/releases/oxygen"/>
-        <repository
-            url="http://download.eclipse.org/cbi/updates/license"/>
-        <repository
-            url="http://download.eclipse.org/tools/orbit/downloads/drops/R20170919201930/repository/"/>
         <repository
-            url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones/"/>
-        <repository
-            url="http://www.xpect-tests.org/updatesite/nightly/"/>
+            url="https://download.eclipse.org/tools/orbit/downloads/2019-12"/>
       </repositoryList>
     </targlet>
   </setupTask>
@@ -141,28 +106,6 @@
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
-  <setupTask
-      xsi:type="projects:ProjectsImportTask"
-      id="jnario.import">
-    <sourceLocator
-        rootFolder="${jnario.git.clone.location}"
-        locateNestedProjects="true"/>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      id="jnario.git.location"
-      name="jnario.git.location"
-      defaultValue="${installation.location/git/}${@id.remoteURI|gitRepository}">
-    <description>the git checkout location</description>
-  </setupTask>
-  <setupTask
-      xsi:type="setup:VariableTask"
-      id="git.clone.location"
-      name="git.clone.location"
-      value=""
-      defaultValue="${jnario.git.location}">
-    <description>the git checkout location</description>
-  </setupTask>
   <stream name="master"
       label="master"/>
   <logicalProjectContainer

plugins/org.jnario.feature.ui/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Version: 1.1.2.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.21.0)",
+Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.ui.editors,
  org.eclipse.ui.ide,
  org.eclipse.xtext.ui.shared,
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="[2.11.0,2.21.0)",
  org.eclipse.debug.core,
  org.eclipse.debug.ui,
  org.jnario.feature,
- org.eclipse.xtext.xbase.lib;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
  org.eclipse.jdt.ui,
  org.eclipse.jdt.core,

plugins/org.jnario.feature/META-INF/MANIFEST.MF

@@ -7,17 +7,17 @@ Bundle-Version: 1.1.2.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.21.0)";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.21.0)";resolution:=optional;visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.20.0,3.0.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.21.0)",
+ org.eclipse.xtext.util;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.20.0,3.0.0)",
  org.jnario.lib,
  org.jnario;bundle-version="1.0.0",
  org.eclipse.xtext.xbase.lib,

plugins/org.jnario.lib/META-INF/MANIFEST.MF

@@ -11,7 +11,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.21.0)";visibility:=reexport
+Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)";visibility:=reexport
 Import-Package: junit.extensions,
  junit.framework,
  junit.runner,

plugins/org.jnario.m2e/META-INF/MANIFEST.MF

@@ -9,8 +9,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.21.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.m2e.maven.runtime;bundle-version="1.0.0";resolution:=optional,
- org.eclipse.xtext.builder;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.20.0,3.0.0)",
  org.jnario;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

plugins/org.jnario.spec.ui/META-INF/MANIFEST.MF

@@ -27,7 +27,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.21.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.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,

plugins/org.jnario.spec/META-INF/MANIFEST.MF

@@ -7,20 +7,20 @@ Bundle-Version: 1.1.2.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.21.0)";visibility:=reexport,
- org.eclipse.xtext.xbase;bundle-version="[2.11.0,2.21.0)";resolution:=optional;visibility:=reexport,
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.20.0,3.0.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.21.0)",
+ org.eclipse.xtext.util;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.emf.common,
  org.antlr.runtime,
- org.eclipse.xtext.common.types;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.common.types;bundle-version="[2.20.0,3.0.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.21.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.jdt.annotation;bundle-version="1.0.0";resolution:=optional,
  org.apache.commons.lang,
  org.objectweb.asm;bundle-version="[5.0.1,7.0.0)";resolution:=optional,

plugins/org.jnario.standalone/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Version: 1.1.2.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.xtext;bundle-version="[2.11.0,2.21.0)",
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.jdt.core,
  org.jnario.feature;bundle-version="1.0.0",
  org.jnario;bundle-version="1.0.0",

plugins/org.jnario.ui/META-INF/MANIFEST.MF

@@ -7,19 +7,19 @@ Bundle-Version: 1.1.2.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.21.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.jdt.core,
  org.eclipse.core.runtime,
- org.eclipse.xtext.ui;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)",
  org.jnario;bundle-version="1.0.0",
- org.eclipse.xtext.common.types.ui;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.common.types.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.jdt.ui,
- org.eclipse.xtext.xbase.ui;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.xbase.ui;bundle-version="[2.20.0,3.0.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.21.0)",
- org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.11.0,2.21.0)";visibility:=reexport,
+ org.eclipse.xtext.ui.shared;bundle-version="[2.20.0,3.0.0)",
+ org.eclipse.xtext.ui.codetemplates.ui;bundle-version="[2.20.0,3.0.0)";visibility:=reexport,
  org.eclipse.jdt.junit.runners;bundle-version="0.1.0";resolution:=optional,
  org.jnario.xbase.richstring.ui
 Bundle-ActivationPolicy: lazy

plugins/org.jnario/META-INF/MANIFEST.MF

@@ -10,11 +10,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.21.0)",
+Require-Bundle: org.eclipse.xtext;bundle-version="[2.20.0,3.0.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.21.0)";visibility:=reexport,
+ org.eclipse.xtext.xbase;bundle-version="[2.20.0,3.0.0)";visibility:=reexport,
  org.jnario.lib,
  org.eclipse.emf.mwe2.lib;resolution:=optional,
  org.apache.commons.lang,

tests/org.jnario.lib.tests/META-INF/MANIFEST.MF

@@ -10,6 +10,6 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  org.jnario.lib;bundle-version="1.0.0",
  org.jnario;bundle-version="1.0.0",
  org.jnario.tests;bundle-version="1.0.0",
- org.eclipse.xtext.util;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.util;bundle-version="[2.20.0,3.0.0)",
  org.mockito;bundle-version="1.8.4",
  org.objenesis;bundle-version="1.0.0"

tests/org.jnario.standalone.tests/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ Require-Bundle: org.jnario.standalone,
  org.jnario.spec,
  org.hamcrest;bundle-version="1.1.0",
  org.junit,
- org.eclipse.xtext.junit4;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.junit4;bundle-version="[2.20.0,3.0.0)",
  com.google.inject,
  com.google.guava,
  org.eclipse.xtext.xbase.lib,

tests/org.jnario.tests/META-INF/MANIFEST.MF

@@ -8,10 +8,10 @@ Bundle-SymbolicName: org.jnario.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext.junit4;visibility:=reexport,
  org.junit;visibility:=reexport,
- org.eclipse.xtext.builder;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.20.0,3.0.0)",
  org.jnario;bundle-version="1.0.0";visibility:=reexport,
  org.jnario.lib;bundle-version="1.0.0",
- org.eclipse.xtext.xbase.junit;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.xbase.junit;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.jdt.core;visibility:=reexport,
  org.jnario.feature;bundle-version="1.0.0",
  org.hamcrest;bundle-version="1.1.0",

tests/org.jnario.ui.tests/META-INF/MANIFEST.MF

@@ -16,7 +16,7 @@ Require-Bundle: org.jnario,
  org.jnario.suite.ui,
  org.jnario.tests,
  org.jnario.ui,
- org.eclipse.xtext.common.types.ui;bundle-version="[2.11.0,2.21.0)",
+ org.eclipse.xtext.common.types.ui;bundle-version="[2.20.0,3.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.xtext.ui;bundle-version="[2.11.0,2.21.0)"
+ org.eclipse.xtext.ui;bundle-version="[2.20.0,3.0.0)"