diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0b887bba544..5407fbfbf69 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/settings/checkstyle.xml b/settings/checkstyle.xml
index eac126711ea..07984b131d0 100644
--- a/settings/checkstyle.xml
+++ b/settings/checkstyle.xml
@@ -87,7 +87,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
         <module name="JavadocMethod">
             <property name="scope" value="protected"/>
             <property name="severity" value="warning"/>
-            <property name="allowMissingJavadoc" value="true"/>
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
             <property name="allowMissingThrowsTags" value="true"/>
@@ -95,6 +94,8 @@ page at http://checkstyle.sourceforge.net/config.html -->
             <property name="allowUndeclaredRTE" value="true"/>
         </module>
 
+        <module name="MissingJavadocMethod" />
+
         <!--
         NAMING CHECKS
         -->