Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/.classpath
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/.classpath	(revision 103)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/.classpath	(revision 104)
@@ -4,5 +4,9 @@
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/.settings/org.eclipse.jdt.core.prefs	(revision 104)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/.settings/org.eclipse.jdt.core.prefs	(revision 104)
@@ -0,0 +1,15 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/META-INF/MANIFEST.MF
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/META-INF/MANIFEST.MF	(revision 103)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf.ui/META-INF/MANIFEST.MF	(revision 104)
@@ -23,9 +23,9 @@
  com.google.inject,
  org.eclipse.xtext
-Import-Package: com.ibm.icu.util;version="50.1.1",
+Import-Package: com.ibm.icu.util,
  org.apache.log4j,
  org.eclipse.xtext.generator,
  org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: de.ugoe.cs.swe.bnftools.ui.contentassist,
  de.ugoe.cs.swe.bnftools.ui.contentassist.antlr;
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.classpath
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.classpath	(revision 103)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.classpath	(revision 104)
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="libs/" kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="xtend-gen"/>
 	<classpathentry kind="src" path="src/libs"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="lib" path="src/libs/avalon-framework-4.2.0.jar"/>
 	<classpathentry kind="lib" path="src/libs/batik-all-1.7.jar"/>
@@ -15,7 +14,10 @@
 	<classpathentry kind="lib" path="src/libs/xalan-2.7.0.jar"/>
 	<classpathentry kind="lib" path="src/libs/xercesImpl-2.7.1.jar"/>
-	<classpathentry kind="lib" path="src/libs/xml-apis-1.3.04.jar"/>
-	<classpathentry kind="lib" path="src/libs/xml-apis-ext-1.3.04.jar"/>
 	<classpathentry kind="lib" path="src/libs/xmlgraphics-commons-1.5.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.settings/org.eclipse.jdt.core.prefs	(revision 103)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/.settings/org.eclipse.jdt.core.prefs	(revision 104)
@@ -1,7 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF	(revision 103)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/META-INF/MANIFEST.MF	(revision 104)
@@ -9,5 +9,5 @@
  org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.generator;resolution:=optional,
- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,
+ org.apache.commons.logging;resolution:=optional,
  org.eclipse.emf.codegen.ecore;resolution:=optional,
  org.eclipse.emf.mwe.utils;resolution:=optional,
@@ -20,7 +20,7 @@
 Import-Package: org.apache.log4j,
  org.eclipse.core.resources,
- org.eclipse.core.runtime;version="3.4.0",
+ org.eclipse.core.runtime,
  org.eclipse.xtext.xbase.lib
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: de.ugoe.cs.swe.bnftools;uses:="org.eclipse.xtext,org.eclipse.xtext.service,com.google.inject",
  de.ugoe.cs.swe.bnftools.ebnf;uses:="org.eclipse.emf.ecore,org.eclipse.emf.common.util",
@@ -35,3 +35,12 @@
  de.ugoe.cs.swe.bnftools.services;uses:="org.eclipse.xtext,org.eclipse.xtext.service",
  de.ugoe.cs.swe.bnftools.validation;uses:="de.ugoe.cs.swe.bnftools.ebnf"
-Bundle-ClassPath: .,src/libs/avalon-framework-4.2.0.jar,src/libs/batik-all-1.7.jar,src/libs/commons-io-1.3.1.jar,src/libs/commons-logging-1.0.4.jar,src/libs/fop.jar,src/libs/serializer-2.7.0.jar,src/libs/xalan-2.7.0.jar,src/libs/xercesImpl-2.7.1.jar,src/libs/xml-apis-1.3.04.jar,src/libs/xml-apis-ext-1.3.04.jar,src/libs/xmlgraphics-commons-1.5.jar
+Bundle-ClassPath: .,
+ src/libs/avalon-framework-4.2.0.jar,
+ src/libs/batik-all-1.7.jar,
+ src/libs/commons-io-1.3.1.jar,
+ src/libs/commons-logging-1.0.4.jar,
+ src/libs/fop.jar,
+ src/libs/serializer-2.7.0.jar,
+ src/libs/xalan-2.7.0.jar,
+ src/libs/xercesImpl-2.7.1.jar,
+ src/libs/xmlgraphics-commons-1.5.jar
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/build.properties
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/build.properties	(revision 103)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/build.properties	(revision 104)
@@ -18,6 +18,4 @@
                src/libs/xalan-2.7.0.jar,\
                src/libs/xercesImpl-2.7.1.jar,\
-               src/libs/xml-apis-1.3.04.jar,\
-               src/libs/xml-apis-ext-1.3.04.jar,\
                src/libs/xmlgraphics-commons-1.5.jar,\
                .