diff --git a/.travis.yml b/.travis.yml
index 681d088f..f6d22881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: java
 jdk:
   - oraclejdk8
+  - oraclejdk11
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/checkstyle.xml b/checkstyle.xml
index 8af2c540..7d787bae 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -47,19 +47,18 @@
         <property name="fileExtensions" value="java"/>
     </module>
 
-    <module name="SuppressionCommentFilter"/>
-
-    <module name="SuppressWithNearbyCommentFilter">
-        <property name="commentFormat" value="CHECKSTYLE DISABLE ([\w\|]+) FOR (-?\d+) LINES"/>
-        <property name="checkFormat" value="$1"/>
-        <property name="influenceFormat" value="$2"/>
-    </module>
-
-
     <module name="TreeWalker">
+        <module name="SuppressionCommentFilter">
+            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+            <property name="checkFormat" value="$1"/>
+        </module>
 
-        <module name="FileContentsHolder"/>
-
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="CHECKSTYLE DISABLE ([\w\|]+) FOR (-?\d+) LINES"/>
+            <property name="checkFormat" value="$1"/>
+            <property name="influenceFormat" value="$2"/>
+        </module>
 
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
diff --git a/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreMetadata.java b/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreMetadata.java
index d2b56696..cac7ecf0 100644
--- a/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreMetadata.java
+++ b/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/MoreMetadata.java
@@ -35,9 +35,9 @@ private MoreMetadata() { }
      * @param clazz the type to serialize
      * @param <T>
      */
-    public static final <T> Metadata.AsciiMarshaller<T> JSON_MARSHALLER(Class<T> clazz) {
+    public static <T> Metadata.AsciiMarshaller<T> JSON_MARSHALLER(Class<T> clazz) {
         return new Metadata.AsciiMarshaller<T>() {
-            TypeToken<T> typeToken = TypeToken.of(clazz);
+            private TypeToken<T> typeToken = TypeToken.of(clazz);
             private Gson gson = new Gson();
 
             @Override
diff --git a/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java b/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
index fdb3ca95..226f3dd4 100644
--- a/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
+++ b/contrib/grpc-contrib/src/main/java/com/salesforce/grpc/contrib/Statuses.java
@@ -31,9 +31,9 @@
  *         stub.someServiceOperation(...);
  *     } catch (Throwable t) {
  *         if (hasStatusCode(t, Status.Code.UNAUTHENTICATED)) {
- *             doWithStatus(t, (status, metadata) -> showLoginPrompt());
+ *             doWithStatus(t, (status, metadata) → showLoginPrompt());
  *         } else if (hasStatus(t) {
- *             doWithStatus(t, (status, metadata) -> handleGrpcProblem(status));
+ *             doWithStatus(t, (status, metadata) → handleGrpcProblem(status));
  *         } else {
  *             throw t;
  *         }
diff --git a/contrib/grpc-spring/src/main/java/com/salesforce/grpc/contrib/spring/GuavaLFReturnValueHandler.java b/contrib/grpc-spring/src/main/java/com/salesforce/grpc/contrib/spring/GuavaLFReturnValueHandler.java
index e67ad796..88ca66f0 100644
--- a/contrib/grpc-spring/src/main/java/com/salesforce/grpc/contrib/spring/GuavaLFReturnValueHandler.java
+++ b/contrib/grpc-spring/src/main/java/com/salesforce/grpc/contrib/spring/GuavaLFReturnValueHandler.java
@@ -45,7 +45,7 @@
  * {@literal @}Controller
  * public class MyController {
  *     {@literal @}RequestMapping(method = RequestMethod.GET, value = "/home")
- *     ListenableFuture<ModelAndView> home(HttpServletRequest request, Model model) {
+ *     ListenableFuture&lt;ModelAndView&gt; home(HttpServletRequest request, Model model) {
  *         // work that returns a ListenableFuture...
  *     }
  * }
diff --git a/contrib/pom.xml b/contrib/pom.xml
index 6d11da37..7aefc417 100644
--- a/contrib/pom.xml
+++ b/contrib/pom.xml
@@ -71,7 +71,7 @@
         <assertj.version>3.6.2</assertj.version>
         <commons-lang.version>2.6</commons-lang.version>
         <awaitility.version>2.0.0</awaitility.version>
-        <mockito.version>2.7.5</mockito.version>
+        <mockito.version>2.27.0</mockito.version>
 
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -84,6 +84,14 @@
         <developerConnection>${gitRepo}</developerConnection>
     </scm>
 
+    <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+    </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <!--
@@ -227,15 +235,23 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <configuration>
+                    <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
+                <version>3.0.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>7.1.2</version>
+                        <version>8.21</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -274,6 +290,42 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <author>false</author>
+                    <breakiterator>true</breakiterator>
+                    <doclint>accessibility,html,reference,syntax</doclint>
+                    <keywords>true</keywords>
+                    <version>false</version>
+                    <source>8</source>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -293,37 +345,6 @@
             <id>public-release</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
diff --git a/demos/grpc-java-contrib-demo/pom.xml b/demos/grpc-java-contrib-demo/pom.xml
index cc925e6b..6967a70c 100644
--- a/demos/grpc-java-contrib-demo/pom.xml
+++ b/demos/grpc-java-contrib-demo/pom.xml
@@ -23,6 +23,14 @@
         <module>time-service-demo</module>
     </modules>
 
+    <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+    </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
diff --git a/demos/pom.xml b/demos/pom.xml
index 7b45af3f..5dac7924 100644
--- a/demos/pom.xml
+++ b/demos/pom.xml
@@ -71,7 +71,7 @@
         <assertj.version>3.6.2</assertj.version>
         <commons-lang.version>2.6</commons-lang.version>
         <awaitility.version>2.0.0</awaitility.version>
-        <mockito.version>2.7.5</mockito.version>
+        <mockito.version>2.27.0</mockito.version>
 
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -157,12 +157,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
+                <version>3.0.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>7.1.2</version>
+                        <version>8.21</version>
                     </dependency>
                 </dependencies>
                 <executions>
diff --git a/jprotoc/pom.xml b/jprotoc/pom.xml
index 9b062acb..e2f02bbd 100644
--- a/jprotoc/pom.xml
+++ b/jprotoc/pom.xml
@@ -72,7 +72,7 @@
         <assertj.version>3.6.2</assertj.version>
         <commons-lang.version>2.6</commons-lang.version>
         <awaitility.version>2.0.0</awaitility.version>
-        <mockito.version>2.7.5</mockito.version>
+        <mockito.version>2.27.0</mockito.version>
 
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -85,6 +85,14 @@
         <developerConnection>${gitRepo}</developerConnection>
     </scm>
 
+    <dependencies>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+    </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <!--
@@ -184,15 +192,23 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <configuration>
+                    <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.17</version>
+                <version>3.0.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>7.1.2</version>
+                        <version>8.21</version>
                     </dependency>
                 </dependencies>
                 <executions>
@@ -231,6 +247,42 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <author>false</author>
+                    <breakiterator>true</breakiterator>
+                    <doclint>accessibility,html,reference,syntax</doclint>
+                    <keywords>true</keywords>
+                    <version>false</version>
+                    <source>8</source>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
@@ -250,37 +302,6 @@
             <id>public-release</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>