diff --git a/build.gradle b/build.gradle
index 78416135062..9119a9c4859 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ allprojects {
     }
 
     codenarc {
-        toolVersion = '1.5'
+        toolVersion = '3.1.0'
         reportFormat = 'console'
     }
 
diff --git a/config/codenarc/codenarc.xml b/config/codenarc/codenarc.xml
index 63b70dcbe99..5d8ced301e6 100644
--- a/config/codenarc/codenarc.xml
+++ b/config/codenarc/codenarc.xml
@@ -5,19 +5,24 @@
         xsi:noNamespaceSchemaLocation="http://codenarc.org/ruleset-schema.xsd">
     <ruleset-ref path='rulesets/basic.xml' />
     <ruleset-ref path='rulesets/braces.xml' />
+    <!-- <ruleset-ref path='rulesets/comments.xml' /> -->
     <ruleset-ref path='rulesets/concurrency.xml' />
     <!-- <ruleset-ref path='rulesets/convention.xml' />
-    <ruleset-ref path='rulesets/design.xml' />
+    <ruleset-ref path='rulesets/design.xml' /> -->
     <ruleset-ref path='rulesets/dry.xml' />
+    <ruleset-ref path='rulesets/enhanced.xml' />
     <ruleset-ref path='rulesets/exceptions.xml' />
-    <ruleset-ref path='rulesets/formatting.xml' />
-    <ruleset-ref path='rulesets/groovyism.xml' />
+    <!-- <ruleset-ref path='rulesets/formatting.xml' /> -->
+    <ruleset-ref path='rulesets/generic.xml' />
+    <!-- <ruleset-ref path='rulesets/groovyism.xml' />
     <ruleset-ref path='rulesets/imports.xml' />
-    <ruleset-ref path='rulesets/junit.xml' />
-    <ruleset-ref path='rulesets/size.xml' />
+    <ruleset-ref path='rulesets/jdbc.xml' />
+    <ruleset-ref path='rulesets/junit.xml' /> -->
     <ruleset-ref path='rulesets/logging.xml' />
+    <!-- <ruleset-ref path='rulesets/naming.xml' /> -->
     <ruleset-ref path='rulesets/security.xml' />
     <ruleset-ref path='rulesets/serialization.xml' />
+    <!-- <ruleset-ref path='rulesets/size.xml' />
     <ruleset-ref path='rulesets/unnecessary.xml' /> -->
     <ruleset-ref path='rulesets/unused.xml' />
 </ruleset>