diff --git a/common/metrics/src/main/java/io/helidon/common/metrics/Loader.java b/common/metrics/src/main/java/io/helidon/common/metrics/Loader.java
index 1ba8e489b..3cafec5c8 100644
--- a/common/metrics/src/main/java/io/helidon/common/metrics/Loader.java
+++ b/common/metrics/src/main/java/io/helidon/common/metrics/Loader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ class Loader {
                 + io.helidon.common.metrics.InternalBridge.class.getName() + " to load");
     }
 
-    private Loader() {}
+    private Loader() {
+    }
 
 }
diff --git a/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java b/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java
index 206486650..f5e712cb3 100644
--- a/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java
+++ b/common/reactive/src/main/java/io/helidon/common/reactive/ReactiveStreamsAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,9 @@ import reactor.core.publisher.Flux;
 @Deprecated
 public final class ReactiveStreamsAdapter {
 
-    private ReactiveStreamsAdapter() {} // uninstantiable
+    // uninstantiable
+    private ReactiveStreamsAdapter() {
+    }
 
     /**
      * Return a {@link Flow.Publisher} from a {@link
diff --git a/config/config/src/main/java/io/helidon/config/spi/ConfigFilter.java b/config/config/src/main/java/io/helidon/config/spi/ConfigFilter.java
index 0f2af4abd..c0038e448 100644
--- a/config/config/src/main/java/io/helidon/config/spi/ConfigFilter.java
+++ b/config/config/src/main/java/io/helidon/config/spi/ConfigFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,6 +79,7 @@ public interface ConfigFilter {
      *
      * @param config {@code Config} instance under construction
      */
-    default void init(Config config) {}
+    default void init(Config config) {
+    }
 
 }
diff --git a/config/test-infrastructure/src/main/java/io/helidon/config/test/infra/TemporaryFolderExt.java b/config/test-infrastructure/src/main/java/io/helidon/config/test/infra/TemporaryFolderExt.java
index 29dd99a07..a2c6a7441 100644
--- a/config/test-infrastructure/src/main/java/io/helidon/config/test/infra/TemporaryFolderExt.java
+++ b/config/test-infrastructure/src/main/java/io/helidon/config/test/infra/TemporaryFolderExt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,7 +50,8 @@ public class TemporaryFolderExt implements BeforeEachCallback, AfterEachCallback
 
     private Path root;
 
-    private TemporaryFolderExt() {}
+    private TemporaryFolderExt() {
+    }
 
     /**
      * Builds an instance of <code>TemporaryFolderExt</code>.
diff --git a/etc/checkstyle-suppressions.xml b/etc/checkstyle-suppressions.xml
index 20f766240..304c066c3 100644
--- a/etc/checkstyle-suppressions.xml
+++ b/etc/checkstyle-suppressions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-    Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2016, 2020 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -26,23 +26,23 @@
             files="config/config/src/main/java/io/helidon/config/Config.java|integrations/cdi/jpa-cdi/src/main/java/io/helidon/integrations/cdi/jpa/JpaExtension\.java"
             lines="1"/>
 
-        <!-- Java comments with AsciiDoc tag:: and end:: in import section incorrectly flagged
-             as unacceptable blank lines within a package's imports. -->
-        <suppress checks="ImportOrder"
+    <!-- Java comments with AsciiDoc tag:: and end:: in import section incorrectly flagged
+         as unacceptable blank lines within a package's imports. -->
+    <suppress checks="ImportOrder"
             files="examples/guides/se-restful-webservice/src/main/java/io/helidon/guides/se/restfulwebservice/Main.java"/>
-        <suppress checks="ImportOrder"
+    <suppress checks="ImportOrder"
             files="examples/guides/se-restful-webservice/src/main/java/io/helidon/guides/se/restfulwebservice/GreetService.java"/>
-        <suppress checks="NoWhitespaceBefore|SeparatorWrap"
+    <suppress checks="NoWhitespaceBefore|SeparatorWrap"
             files="examples/guides/mp-restful-webservice/src/main/java/io/helidon/guides/mp/restfulwebservice/GreetApplication.java"/>
-        <!--
-         The following files are work taken over from other projects,
-            where we want to keep the author tag untouched
-        -->
-        <!-- Common HTTP project -->
-        <suppress id="Javadoc.javadocNoAuthor"
+    <!--
+     The following files are work taken over from other projects,
+        where we want to keep the author tag untouched
+    -->
+    <!-- Common HTTP project -->
+    <suppress id="Javadoc.javadocNoAuthor"
             files="common/http/Preconditions\.java|common/http/Ascii\.java|common/http/CharMatcher\.java"/>
-        <!-- Webserver project -->
-        <suppress id="Javadoc.javadocNoAuthor"
+    <!-- Webserver project -->
+    <suppress id="Javadoc.javadocNoAuthor"
             files="webserver/UriComponent\.java"/>
 </suppressions>
 
diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml
index 2321c2cad..26e793217 100644
--- a/etc/checkstyle.xml
+++ b/etc/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2016, 2020 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -87,8 +87,15 @@
     <module name="FileLength"/>
 
     <module name="SuppressWarningsFilter" />
+
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="LineLength">
+        <property name="max" value="130"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|@see| \* |@link|imp|@todo|@version|^Args=|.*--initialize-at-build-time|^javax.sql.DataSource"/>
+    </module>
+
     <module name="TreeWalker">
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
 
         <module name="SuppressionCommentFilter">
             <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
@@ -101,7 +108,9 @@
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
         <module name="JavadocMethod">
             <property name="scope" value="protected"/>
-            <property name="allowUndeclaredRTE" value="true"/>
+            <property name="validateThrows" value="false"/>
+        </module>
+        <module name="MissingJavadocMethod">
             <property name="allowMissingPropertyJavadoc" value="true"/>
         </module>
         <module name="JavadocType">
@@ -170,12 +179,6 @@
             <property name="option" value="EOL"/>
         </module>
 
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="130"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|@see| \* |@link|imp|@todo|@version"/>
-        </module>
         <module name="MethodLength"/>
 
         <!-- Some Netty interfaces need this -->
diff --git a/examples/openapi/src/main/java/io/helidon/examples/openapi/Main.java b/examples/openapi/src/main/java/io/helidon/examples/openapi/Main.java
index 09e2dfc9d..dcc105c35 100644
--- a/examples/openapi/src/main/java/io/helidon/examples/openapi/Main.java
+++ b/examples/openapi/src/main/java/io/helidon/examples/openapi/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@ public final class Main {
     /**
      * Cannot be instantiated.
      */
-    private Main() { }
+    private Main() {
+    }
 
     /**
      * Application main entry point.
diff --git a/examples/quickstarts/helidon-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java b/examples/quickstarts/helidon-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java
index 5b310ff83..4b6367f9f 100644
--- a/examples/quickstarts/helidon-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java
+++ b/examples/quickstarts/helidon-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@ public final class Main {
     /**
      * Cannot be instantiated.
      */
-    private Main() { }
+    private Main() {
+    }
 
     /**
      * Application main entry point.
diff --git a/examples/quickstarts/helidon-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java b/examples/quickstarts/helidon-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java
index 65fcc9eed..820f5dcab 100644
--- a/examples/quickstarts/helidon-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java
+++ b/examples/quickstarts/helidon-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@ public final class Main {
     /**
      * Cannot be instantiated.
      */
-    private Main() { }
+    private Main() {
+    }
 
     /**
      * Application main entry point.
diff --git a/examples/quickstarts/helidon-standalone-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java b/examples/quickstarts/helidon-standalone-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java
index 5b310ff83..4b6367f9f 100644
--- a/examples/quickstarts/helidon-standalone-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java
+++ b/examples/quickstarts/helidon-standalone-quickstart-mp/src/main/java/io/helidon/examples/quickstart/mp/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@ public final class Main {
     /**
      * Cannot be instantiated.
      */
-    private Main() { }
+    private Main() {
+    }
 
     /**
      * Application main entry point.
diff --git a/examples/quickstarts/helidon-standalone-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java b/examples/quickstarts/helidon-standalone-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java
index 65fcc9eed..820f5dcab 100644
--- a/examples/quickstarts/helidon-standalone-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java
+++ b/examples/quickstarts/helidon-standalone-quickstart-se/src/main/java/io/helidon/examples/quickstart/se/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@ public final class Main {
     /**
      * Cannot be instantiated.
      */
-    private Main() { }
+    private Main() {
+    }
 
     /**
      * Application main entry point.
diff --git a/examples/todo-app/backend/src/main/java/io/helidon/demo/todos/backend/Main.java b/examples/todo-app/backend/src/main/java/io/helidon/demo/todos/backend/Main.java
index eb2a80bae..9bfa446db 100644
--- a/examples/todo-app/backend/src/main/java/io/helidon/demo/todos/backend/Main.java
+++ b/examples/todo-app/backend/src/main/java/io/helidon/demo/todos/backend/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,8 @@ public final class Main {
     /**
      * Cannot be instantiated.
      */
-    private Main() { }
+    private Main() {
+    }
 
     /**
      * Application main entry point.
diff --git a/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/Main.java b/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/Main.java
index 2af5e7ed3..175f21131 100644
--- a/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/Main.java
+++ b/examples/todo-app/frontend/src/main/java/io/helidon/demo/todos/frontend/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,7 +59,8 @@ public final class Main {
     /**
      * Cannot be instantiated.
      */
-    private Main() { }
+    private Main() {
+    }
 
     /**
      * Application main entry point.
diff --git a/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/Main.java b/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/Main.java
index 9e780b339..f4ae45ee6 100644
--- a/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/Main.java
+++ b/examples/webserver/streaming/src/main/java/io/helidon/webserver/examples/streaming/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,8 @@ public class Main {
 
     static final String LARGE_FILE_RESOURCE = "/large-file.bin";
 
-    private Main() {}
+    private Main() {
+    }
 
     /**
      * Creates new {@link Routing}.
diff --git a/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/Main.java b/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/Main.java
index 23e196acc..ac106a9da 100644
--- a/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/Main.java
+++ b/examples/webserver/tutorial/src/main/java/io/helidon/webserver/examples/tutorial/Main.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@ import io.helidon.webserver.examples.tutorial.user.UserFilter;
  */
 public final class Main {
 
-    private Main() {}
+    private Main() {
+    }
 
     static Routing createRouting() {
         UpperXFilter upperXFilter = new UpperXFilter();
diff --git a/metrics/prometheus/src/main/java/io/helidon/metrics/prometheus/PrometheusSupport.java b/metrics/prometheus/src/main/java/io/helidon/metrics/prometheus/PrometheusSupport.java
index 739dd07e3..8257998ee 100644
--- a/metrics/prometheus/src/main/java/io/helidon/metrics/prometheus/PrometheusSupport.java
+++ b/metrics/prometheus/src/main/java/io/helidon/metrics/prometheus/PrometheusSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -209,7 +209,8 @@ public final class PrometheusSupport implements Service {
         private CollectorRegistry registry = CollectorRegistry.defaultRegistry;
         private String path;
 
-        private Builder() {}
+        private Builder() {
+        }
 
         /**
          * Sets collector registry to use, default is {@link CollectorRegistry#defaultRegistry}.
diff --git a/pom.xml b/pom.xml
index 5860bd616..f656092d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2016, 2020 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@
         <version.lib.arquillian-weld-embedded>2.0.0.Final</version.lib.arquillian-weld-embedded>
         <version.lib.asciidoctor.diagram>1.5.4.1</version.lib.asciidoctor.diagram>
         <version.lib.asm>6.0</version.lib.asm>
-        <version.lib.checkstyle>8.18</version.lib.checkstyle>
+        <version.lib.checkstyle>8.29</version.lib.checkstyle>
         <version.lib.classfilewriter>1.2.4.Final</version.lib.classfilewriter>
         <version.lib.groovy-all>2.4.14</version.lib.groovy-all>
         <version.lib.jboss-annotations-api_1.3_spec>1.0.0.Final</version.lib.jboss-annotations-api_1.3_spec>
@@ -87,7 +87,7 @@
         <version.plugin.archetype-packaging>3.1.2</version.plugin.archetype-packaging>
         <version.plugin.archetype>3.1.2</version.plugin.archetype>
         <version.plugin.build-helper>1.12</version.plugin.build-helper>
-        <version.plugin.checkstyle>2.17</version.plugin.checkstyle>
+        <version.plugin.checkstyle>3.1.0</version.plugin.checkstyle>
         <version.plugin.compiler>3.8.1</version.plugin.compiler>
         <version.plugin.dependency>3.0.0</version.plugin.dependency>
         <version.plugin.directory>0.1</version.plugin.directory>
@@ -474,7 +474,9 @@
                     <artifactId>maven-checkstyle-plugin</artifactId>
                     <version>${version.plugin.checkstyle}</version>
                     <configuration>
-                        <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                        <sourceDirectories>
+                            <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                        </sourceDirectories>
                     </configuration>
                     <dependencies>
                         <dependency>
diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/HashRequestHeaders.java b/webserver/webserver/src/main/java/io/helidon/webserver/HashRequestHeaders.java
index aceddc61a..be9caf313 100644
--- a/webserver/webserver/src/main/java/io/helidon/webserver/HashRequestHeaders.java
+++ b/webserver/webserver/src/main/java/io/helidon/webserver/HashRequestHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -188,7 +188,8 @@ class HashRequestHeaders extends ReadOnlyParameters implements RequestHeaders {
      */
     static class CookieParser {
 
-        private CookieParser() {}
+        private CookieParser() {
+        }
 
         private static final String RFC2965_VERSION = "$Version";
         private static final String RFC2965_PATH = "$Path";
diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/PathPattern.java b/webserver/webserver/src/main/java/io/helidon/webserver/PathPattern.java
index 422a282d7..363b9fc70 100644
--- a/webserver/webserver/src/main/java/io/helidon/webserver/PathPattern.java
+++ b/webserver/webserver/src/main/java/io/helidon/webserver/PathPattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,7 +65,8 @@ final class PathPattern {
     /**
      * A utility class. Cannot be constructed.
      */
-    private PathPattern() {}
+    private PathPattern() {
+    }
 
     /**
      * Compiles a standard {@link PathMatcher} pattern.