diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 15c29e837..3c0bb275a 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -870,9 +870,16 @@
 					<configuration>
 						<encoding>UTF-8</encoding>
 						<useProjectSettings>false</useProjectSettings>
-						<compilerArgument>-err:-forbidden</compilerArgument>
+<!--						<compilerArgument>-err:-forbidden</compilerArgument> -->
+						<compilerArgs>
+							<arg>-err:-forbidden</arg>
+							<arg>--add-modules</arg>
+							<arg>java.base,java.management,java.xml</arg>
+							<arg>--limit-modules</arg>
+							<arg>java.base,java.management,java.xml</arg>
+						</compilerArgs>
 					</configuration>
-				</plugin>
+					</plugin>
 				<plugin>
 					<groupId>org.eclipse.tycho</groupId>
 					<artifactId>target-platform-configuration</artifactId>
diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
index 588b376cd..002fab8e0 100644
--- a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
+++ b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.core.resources,
  org.reactivestreams.reactive-streams,
  com.google.guava,
  org.eclipse.wst.sse.core
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Export-Package: org.springframework.ide.eclipse.boot.core,
  org.springframework.ide.eclipse.boot.core.cli,