diff --git a/.travis.yml b/.travis.yml
index bcf4ad9e9f..6766833ee3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ cache:
     - $HOME/.m2
 jdk:
 - oraclejdk8
+- openjdk11
 install: true
 script: ./travis/build.sh
 notifications:
diff --git a/http-service/pom.xml b/http-service/pom.xml
index eba29dfe40..8d8ffa6803 100644
--- a/http-service/pom.xml
+++ b/http-service/pom.xml
@@ -184,6 +184,14 @@
 				<groupId>com.github.kongchen</groupId>
 				<artifactId>swagger-maven-plugin</artifactId>
 				<version>3.1.8</version>
+				<dependencies>
+					<!-- Java 11+ does not include this anymore -->
+					<dependency>
+						<groupId>javax.xml.bind</groupId>
+						<artifactId>jaxb-api</artifactId>
+						<version>2.3.1</version>
+					</dependency>
+				</dependencies>
 				<configuration>
 					<apiSources>
 						<apiSource>
diff --git a/pom.xml b/pom.xml
index c77d7701e8..bf6afd34fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,10 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>3.0.0-M1</version>
+				<configuration>
+					<!-- Fix Javadoc on Java 11+ - JDK-8212233 -->
+					<source>8</source>
+				</configuration>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>