diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend index 50484d118..bf56baeaa 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.xtend @@ -170,12 +170,14 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment { @Accessors(PUBLIC_SETTER) boolean suppressLoadInitialization = false - GenRuntimeVersion emfRuntimeVersion + /* Default to 2.20 if available, otherwise #get will return null */ + GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF220_VALUE) GenJDKLevel jdkLevel = GenJDKLevel.JDK80_LITERAL String rootExtendsClass = 'org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container' /** * Sets the target EMF runtime version to generate for to the specified value. + * Defaults to 2.20. */ def void setEmfRuntimeVersion(String emfRuntimeVersion) { this.emfRuntimeVersion = GenRuntimeVersion.get(emfRuntimeVersion) @@ -192,7 +194,7 @@ class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment { *
  • "JDK70"
  • *
  • "JDK80"
  • * - * The default level is "JDK60". + * The default level is "JDK80". */ def void setJdkLevel(String jdkLevel) { this.jdkLevel = GenJDKLevel.getByName(jdkLevel) diff --git a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java index be56d8415..8b6323e21 100644 --- a/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java +++ b/org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/ecore/EMFGeneratorFragment2.java @@ -190,7 +190,10 @@ public class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment { @Accessors(AccessorType.PUBLIC_SETTER) private boolean suppressLoadInitialization = false; - private GenRuntimeVersion emfRuntimeVersion; + /** + * Default to 2.20 if available, otherwise #get will return null + */ + private GenRuntimeVersion emfRuntimeVersion = GenRuntimeVersion.get(GenRuntimeVersion.EMF220_VALUE); private GenJDKLevel jdkLevel = GenJDKLevel.JDK80_LITERAL; @@ -198,6 +201,7 @@ public class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment { /** * Sets the target EMF runtime version to generate for to the specified value. + * Defaults to 2.20. */ public void setEmfRuntimeVersion(final String emfRuntimeVersion) { this.emfRuntimeVersion = GenRuntimeVersion.get(emfRuntimeVersion); @@ -215,7 +219,7 @@ public class EMFGeneratorFragment2 extends AbstractXtextGeneratorFragment { *
  • "JDK70"
  • *
  • "JDK80"
  • * - * The default level is "JDK60". + * The default level is "JDK80". */ public void setJdkLevel(final String jdkLevel) { this.jdkLevel = GenJDKLevel.getByName(jdkLevel); diff --git a/releng/pom.xml b/releng/pom.xml index 528aedc6c..fac1b3f9e 100644 --- a/releng/pom.xml +++ b/releng/pom.xml @@ -12,7 +12,7 @@ 1.5.1 ${basedir}/.. https://ci.eclipse.org/xtext - emf220Update + master