diff --git a/.travis.yml b/.travis.yml
index ed26031721..8ca34d44f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
 sudo: required
-dist: xenial
+dist: bionic
 
 language: java
 
-jdk:
-  - openjdk8
-  - openjdk11
+jdk: openjdk11
 
 cache:
   directories:
diff --git a/bundles/org.openhab.ui.basic/.classpath b/bundles/org.openhab.ui.basic/.classpath
index a5d95095cc..234db15be4 100644
--- a/bundles/org.openhab.ui.basic/.classpath
+++ b/bundles/org.openhab.ui.basic/.classpath
@@ -18,7 +18,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.basic/BasicUI Setup.launch b/bundles/org.openhab.ui.basic/BasicUI Setup.launch
index 46ba8aa1d1..944043e1d2 100644
--- a/bundles/org.openhab.ui.basic/BasicUI Setup.launch	
+++ b/bundles/org.openhab.ui.basic/BasicUI Setup.launch	
@@ -13,6 +13,6 @@
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
 <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.openhab.ui.basic}"/>
 </launchConfiguration>
diff --git a/bundles/org.openhab.ui.cometvisu.php/.classpath b/bundles/org.openhab.ui.cometvisu.php/.classpath
index 5e8a55fefb..4559ca0b25 100644
--- a/bundles/org.openhab.ui.cometvisu.php/.classpath
+++ b/bundles/org.openhab.ui.cometvisu.php/.classpath
@@ -13,7 +13,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.cometvisu/.classpath b/bundles/org.openhab.ui.cometvisu/.classpath
index 1fffe92a83..9d911ccc95 100644
--- a/bundles/org.openhab.ui.cometvisu/.classpath
+++ b/bundles/org.openhab.ui.cometvisu/.classpath
@@ -19,7 +19,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src/gen/java"/>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.dashboard/.classpath b/bundles/org.openhab.ui.dashboard/.classpath
index 227787e868..cf526fbfe9 100644
--- a/bundles/org.openhab.ui.dashboard/.classpath
+++ b/bundles/org.openhab.ui.dashboard/.classpath
@@ -28,7 +28,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.habot/.classpath b/bundles/org.openhab.ui.habot/.classpath
index c0fd5fa76a..10e2d98497 100644
--- a/bundles/org.openhab.ui.habot/.classpath
+++ b/bundles/org.openhab.ui.habot/.classpath
@@ -29,7 +29,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.habpanel/.classpath b/bundles/org.openhab.ui.habpanel/.classpath
index d16d268004..2305f09313 100644
--- a/bundles/org.openhab.ui.habpanel/.classpath
+++ b/bundles/org.openhab.ui.habpanel/.classpath
@@ -23,7 +23,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.homebuilder/.classpath b/bundles/org.openhab.ui.homebuilder/.classpath
index 91d859a5df..01b7bfe931 100644
--- a/bundles/org.openhab.ui.homebuilder/.classpath
+++ b/bundles/org.openhab.ui.homebuilder/.classpath
@@ -18,7 +18,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.iconset.classic/.classpath b/bundles/org.openhab.ui.iconset.classic/.classpath
index a5d95095cc..234db15be4 100644
--- a/bundles/org.openhab.ui.iconset.classic/.classpath
+++ b/bundles/org.openhab.ui.iconset.classic/.classpath
@@ -18,7 +18,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/bundles/org.openhab.ui.restdocs/.classpath b/bundles/org.openhab.ui.restdocs/.classpath
index a5d95095cc..234db15be4 100644
--- a/bundles/org.openhab.ui.restdocs/.classpath
+++ b/bundles/org.openhab.ui.restdocs/.classpath
@@ -18,7 +18,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/pom.xml b/pom.xml
index cba2cd5fd8..df7a93d5fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <oh.java.version>1.8</oh.java.version>
+    <oh.java.version>11</oh.java.version>
     <maven.compiler.source>${oh.java.version}</maven.compiler.source>
     <maven.compiler.target>${oh.java.version}</maven.compiler.target>
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
@@ -450,6 +450,26 @@ Import-Package: \\
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-java</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireJavaVersion>
+                  <version>[11.0,12.0)</version>
+                </requireJavaVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>