diff --git a/build.gradle b/build.gradle
index 085668609e674a751ab9279df5902ab1373cacb0..51b3a27364a03593d36df4ac2faf47f1d74f9e0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,7 +53,7 @@ project(':de.prob.ui') {
 		mavenCentral()
 	}
 	dependencies {
-	 	compile 'commons-codec:commons-codec:1.6'
+	 	compile 'commons-codec:commons-codec:1.8'
 	}
 }
 
diff --git a/de.bmotionstudio.gef.editor/.classpath b/de.bmotionstudio.gef.editor/.classpath
index cb2a56821c95aacfefc3381f5c0fa697013c8516..2d8dd8c20601ecc365cdc33bf1a1a4e6e280e50e 100644
--- a/de.bmotionstudio.gef.editor/.classpath
+++ b/de.bmotionstudio.gef.editor/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/ext/antlr-2.7.7.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ext/asm-4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ext/groovy-2.0.5.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
index baf64f0b42cc7aa16a10769e00d3b7c3b2d51262..7c6cc7fcf218e0a22ff21fceace83c304a505187 100644
--- a/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.rodinp.core;bundle-version="[1.7.0,1.8.0)",
  org.eventb.core.ast;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-RegisterBuddy: de.prob.core
 Bundle-Vendor: HHU Düsseldorf STUPS Group
 Export-Package: de.bmotionstudio.gef.editor;
diff --git a/de.bmotionstudio.help/.classpath b/de.bmotionstudio.help/.classpath
index d340cf91de61e0d4f233094a17166bcf96660af6..fac5f8df3a1c459bd4c6ccaa918062115acdc922 100644
--- a/de.bmotionstudio.help/.classpath
+++ b/de.bmotionstudio.help/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.mylyn.wikitext.core_1.7.0.I20120513-1032.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.eclipse.mylyn.wikitext.mediawiki.core_1.7.0.I20120513-1032.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/de.bmotionstudio.help/.settings/org.eclipse.jdt.core.prefs b/de.bmotionstudio.help/.settings/org.eclipse.jdt.core.prefs
index f84eafc964bdfb1f40a434083bdd428ec56ec668..9aa9da1921cace77de25b0c455839cbd4227bcfa 100644
--- a/de.bmotionstudio.help/.settings/org.eclipse.jdt.core.prefs
+++ b/de.bmotionstudio.help/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 #Fri Aug 31 09:17:40 CEST 2012
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/de.bmotionstudio.help/META-INF/MANIFEST.MF b/de.bmotionstudio.help/META-INF/MANIFEST.MF
index b7f577358c479b3acfa9d2d39aacae4ab8847288..dc301219a6208afe40deb2044a18890a4609b1db 100644
--- a/de.bmotionstudio.help/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.help/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: BMotion Studio Help
 Bundle-SymbolicName: de.bmotionstudio.help;singleton:=true
 Bundle-Version: 1.0.1.qualifier
 Require-Bundle: org.eclipse.help;bundle-version="3.5.100"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: HHU Düsseldorf STUPS Group
 Eclipse-RegisterBuddy: de.bmotionstudio.gef.editor
 Bundle-ClassPath: lib/org.eclipse.mylyn.wikitext.core_1.7.0.I20120513-1032.jar,
diff --git a/de.bmotionstudio.rodin/.classpath b/de.bmotionstudio.rodin/.classpath
index 8a8f1668cdcc5c73a6921162616f01cb556ae7c1..b862a296d38fe04269faeee6c9d77d11ff77380d 100644
--- a/de.bmotionstudio.rodin/.classpath
+++ b/de.bmotionstudio.rodin/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.bmotionstudio.rodin/META-INF/MANIFEST.MF b/de.bmotionstudio.rodin/META-INF/MANIFEST.MF
index 5173086bd1118fba776ae50ccc0fac132c8f4ea5..1aa2df07cd2993a6b0a170e20c71e09ed03bea56 100644
--- a/de.bmotionstudio.rodin/META-INF/MANIFEST.MF
+++ b/de.bmotionstudio.rodin/META-INF/MANIFEST.MF
@@ -4,6 +4,6 @@ Bundle-Name: BMotion Studio Rodin Integration
 Bundle-SymbolicName: de.bmotionstudio.rodin;singleton:=true
 Bundle-Version: 1.2.0.qualifier
 Fragment-Host: de.bmotionstudio.gef.editor;bundle-version="[5.5.0,5.6.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: HHU Düsseldorf STUPS Group
 Require-Bundle: org.eclipse.ui.navigator;bundle-version="3.5.0"
diff --git a/de.prob.core.tests/.classpath b/de.prob.core.tests/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/de.prob.core.tests/.classpath
+++ b/de.prob.core.tests/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.prob.core.tests/.settings/org.eclipse.jdt.core.prefs b/de.prob.core.tests/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/de.prob.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/de.prob.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/de.prob.core.tests/META-INF/MANIFEST.MF b/de.prob.core.tests/META-INF/MANIFEST.MF
index fc445d16b3ea4a1b070d3bb59e600916d376f663..813b16b3654e31e4ee83e35156d2e0926d7395f9 100644
--- a/de.prob.core.tests/META-INF/MANIFEST.MF
+++ b/de.prob.core.tests/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Require-Bundle: org.eclipse.ui,
  org.eventb.core;bundle-version="[2.1.0,2.6.0)",
  de.prob.core;bundle-version="9.3.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF
index 6e60a38cb07430832a8fcb5246a9590993ef8d99..bd4bb0fa5488a5b1c35f112d8fecf642cb65dfd4 100644
--- a/de.prob.core/META-INF/MANIFEST.MF
+++ b/de.prob.core/META-INF/MANIFEST.MF
@@ -115,7 +115,7 @@ Export-Package: com.thoughtworks.xstream,
  org.ptolemy.fmi.type
 Bundle-Activator: de.prob.core.internal.Activator
 Eclipse-BuddyPolicy: registered
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
  lib/dependencies/unicode-2.5.1.jar,
  lib/dependencies/theorymapping-2.5.1.jar,
@@ -135,7 +135,7 @@ Bundle-ClassPath: .,
  lib/dependencies/answerparser-2.5.0.jar,
  lib/dependencies/ptolemy-jfmi-1.1.0.jar,
  lib/dependencies/xstream-1.4.7.jar,
- lib/dependencies/commons-codec-1.6.jar,
+ lib/dependencies/commons-codec-1.8.jar,
  lib/dependencies/commons-lang-2.6.jar,
  lib/dependencies/jsr305-1.3.9.jar,
  lib/dependencies/xmlpull-1.1.3.1.jar,
diff --git a/de.prob.core/build.gradle b/de.prob.core/build.gradle
index 4a37297b73cdcdc22e4504417d8a0fcffb262d99..f641c88dc00fce6b45fe8cb1f1da61f5c1091a16 100644
--- a/de.prob.core/build.gradle
+++ b/de.prob.core/build.gradle
@@ -12,7 +12,7 @@ dependencies {
  compile group: "de.hhu.stups", name: "unicode", version: parser_version , changing: true
  compile group: "de.hhu.stups", name: "theorymapping", version: parser_version , changing: true
  compile 'commons-lang:commons-lang:2.6'
- compile 'commons-codec:commons-codec:1.6'
+ compile 'commons-codec:commons-codec:1.8'
  compile 'com.thoughtworks.xstream:xstream:1.4.7'
  compile group: 'net.java.dev.jna', name: 'jna', version: '3.4.0'
  compile group: 'de.hhu.stups', name: 'ptolemy-jfmi', version: '1.1.0'
diff --git a/de.prob.core/build.properties b/de.prob.core/build.properties
index b89d6661d6b4d6e361e2fefeca4f53c725c62437..855ea77ea9114fe64c17d7ee1209b48dadaacdfa 100644
--- a/de.prob.core/build.properties
+++ b/de.prob.core/build.properties
@@ -5,7 +5,7 @@ bin.includes = META-INF/,\
                .,\
                prob/,\
                lib/,\
-               lib/dependencies/commons-codec-1.6.jar,\
+               lib/dependencies/commons-codec-1.8.jar,\
                lib/dependencies/xmlpull-1.1.3.1.jar,\
                lib/dependencies/xpp3_min-1.1.4c.jar,\
                lib/dependencies/ptolemy-jfmi-1.1.0.jar,\
diff --git a/de.prob.eventb.disprover.core/.classpath b/de.prob.eventb.disprover.core/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/de.prob.eventb.disprover.core/.classpath
+++ b/de.prob.eventb.disprover.core/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.prob.eventb.disprover.core/.settings/org.eclipse.jdt.core.prefs b/de.prob.eventb.disprover.core/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/de.prob.eventb.disprover.core/.settings/org.eclipse.jdt.core.prefs
+++ b/de.prob.eventb.disprover.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/de.prob.eventb.disprover.ui/.classpath b/de.prob.eventb.disprover.ui/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/de.prob.eventb.disprover.ui/.classpath
+++ b/de.prob.eventb.disprover.ui/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.prob.eventb.disprover.ui/.settings/org.eclipse.jdt.core.prefs b/de.prob.eventb.disprover.ui/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/de.prob.eventb.disprover.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/de.prob.eventb.disprover.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/de.prob.plugin/.classpath b/de.prob.plugin/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/de.prob.plugin/.classpath
+++ b/de.prob.plugin/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.prob.plugin/META-INF/MANIFEST.MF b/de.prob.plugin/META-INF/MANIFEST.MF
index 0e6729300d3e168ca78c55c5ef9a151b9883d0fd..0eac426f5aca69dba8ef249c8c93b688a6804f53 100644
--- a/de.prob.plugin/META-INF/MANIFEST.MF
+++ b/de.prob.plugin/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: ProB Rodin2 UI Bindings
 Bundle-SymbolicName: de.prob.plugin;singleton:=true
 Bundle-Version: 2.3.2.qualifier
 Fragment-Host: de.prob.ui;bundle-version="[7.4.0,7.5.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: HHU Düsseldorf STUPS Group
diff --git a/de.prob.symbolic/.classpath b/de.prob.symbolic/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/de.prob.symbolic/.classpath
+++ b/de.prob.symbolic/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.prob.symbolic/.settings/org.eclipse.jdt.core.prefs b/de.prob.symbolic/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/de.prob.symbolic/.settings/org.eclipse.jdt.core.prefs
+++ b/de.prob.symbolic/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/de.prob.symbolic/META-INF/MANIFEST.MF b/de.prob.symbolic/META-INF/MANIFEST.MF
index 9d697f140e59d2e39fcf96265eb3c2a2f820b0db..f81f55af7ce879bdb5a4a4930c6f3d9fdd0167f6 100644
--- a/de.prob.symbolic/META-INF/MANIFEST.MF
+++ b/de.prob.symbolic/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eventb.core;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: HHU Düsseldorf STUPS Group
diff --git a/de.prob.ui/.classpath b/de.prob.ui/.classpath
index 100092b255b1ad1a077f31d3e5931b134f6f5f45..33fdb1188c2a54df76fa41485233855aa0f95516 100644
--- a/de.prob.ui/.classpath
+++ b/de.prob.ui/.classpath
@@ -1,10 +1,10 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/apache_xmlrpc.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ws_commons.jar"/>
 	<classpathentry kind="output" path="bin"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/commons-codec-1.6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/dependencies/commons-codec-1.8.jar"/>
 </classpath>
diff --git a/de.prob.ui/META-INF/MANIFEST.MF b/de.prob.ui/META-INF/MANIFEST.MF
index 9128eeeeb64fc81c1cc714776380fa70653140dc..8b071e43108e3c185bb381ce8695ef35d31057ed 100644
--- a/de.prob.ui/META-INF/MANIFEST.MF
+++ b/de.prob.ui/META-INF/MANIFEST.MF
@@ -16,9 +16,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: HHU Düsseldorf STUPS Group
 Bundle-Activator: de.prob.ui.ProbUiPlugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: de.prob.ui
 Bundle-ClassPath: lib/apache_xmlrpc.jar,
  lib/ws_commons.jar,
- lib/dependencies/commons-codec-1.6.jar,
+ lib/dependencies/commons-codec-1.8.jar,
  .
diff --git a/de.prob.ui/build.properties b/de.prob.ui/build.properties
index ebde6b8f79bbb0cfd7a64cb582dcfc2a31e04089..5a878a48d6d518beb16d7d1ea6ff6d4c7197d980 100644
--- a/de.prob.ui/build.properties
+++ b/de.prob.ui/build.properties
@@ -6,4 +6,4 @@ bin.includes = META-INF/,\
                icons/,\
                lib/apache_xmlrpc.jar,\
                lib/ws_commons.jar,\
-               lib/dependencies/commons-codec-1.6.jar
+               lib/dependencies/commons-codec-1.8.jar
diff --git a/de.prob.units.tests/.classpath b/de.prob.units.tests/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/de.prob.units.tests/.classpath
+++ b/de.prob.units.tests/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.prob.units.tests/.settings/org.eclipse.jdt.core.prefs b/de.prob.units.tests/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/de.prob.units.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/de.prob.units.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/de.prob.units.tests/META-INF/MANIFEST.MF b/de.prob.units.tests/META-INF/MANIFEST.MF
index 5ebaf62b1cc891cebf5d9ea7e33b1dfd805b31f5..faa5e9f5c07dd6c95f8210f0c88b2bae42bfcce1 100644
--- a/de.prob.units.tests/META-INF/MANIFEST.MF
+++ b/de.prob.units.tests/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Require-Bundle: org.eclipse.ui,
  de.prob.core;bundle-version="9.3.0",
  org.eventb.core;bundle-version="[2.1.0,2.6.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/de.prob.units/.classpath b/de.prob.units/.classpath
index ad32c83a7885b8953a938b41df3b4fd4fe1aae01..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644
--- a/de.prob.units/.classpath
+++ b/de.prob.units/.classpath
@@ -1,6 +1,6 @@
 <?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/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/de.prob.units/.settings/org.eclipse.jdt.core.prefs b/de.prob.units/.settings/org.eclipse.jdt.core.prefs
index c537b63063ce6052bdc49c5fd0745b078f162c90..0c68a61dca867ceb49e79d2402935261ec3e3809 100644
--- a/de.prob.units/.settings/org.eclipse.jdt.core.prefs
+++ b/de.prob.units/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/de.prob.units/META-INF/MANIFEST.MF b/de.prob.units/META-INF/MANIFEST.MF
index e310ad5d84e3ac3616979ff06058795d63b238fc..1296e04849b8693374da0e39784ebd8f2b5d842c 100644
--- a/de.prob.units/META-INF/MANIFEST.MF
+++ b/de.prob.units/META-INF/MANIFEST.MF
@@ -15,5 +15,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eventb.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.ui.workbench
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: HHU Düsseldorf STUPS Group
diff --git a/tycho_build.gradle b/tycho_build.gradle
index 4cd0a77e18d7adb41d310e8f31b9bf3f7bd870b6..02a0496deb85c3d9d1eb2f930adddde60c211ea2 100644
--- a/tycho_build.gradle
+++ b/tycho_build.gradle
@@ -594,8 +594,8 @@ task tycho(dependsOn: [createPoms] , type:Exec) {
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>tycho-compiler-plugin</artifactId>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.8</source>
+						<target>1.8</target>
 					</configuration>
 	      			</plugin>
 	    		</plugins>