From c3ea6de8e081dadbdbbdd98b975de6f582822713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 12 Aug 2018 19:25:13 +0200
Subject: [PATCH] Move LinguisticNaming to 6.7.0

---
 pmd-core/src/main/resources/rulesets/releases/660.xml   | 1 -
 pmd-core/src/main/resources/rulesets/releases/670.xml   | 2 ++
 pmd-java/src/main/resources/category/java/codestyle.xml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pmd-core/src/main/resources/rulesets/releases/660.xml b/pmd-core/src/main/resources/rulesets/releases/660.xml
index f1d5b09f2b..2f84d06b53 100644
--- a/pmd-core/src/main/resources/rulesets/releases/660.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/660.xml
@@ -9,7 +9,6 @@ This ruleset contains links to rules that are new in PMD v6.6.0
   </description>
 
     <rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"/>
-    <rule ref="category/java/codestyle.xml/LinguisticNaming"/>
     <rule ref="category/java/codestyle.xml/LocalVariableNamingConventions"/>
 </ruleset>
 
diff --git a/pmd-core/src/main/resources/rulesets/releases/670.xml b/pmd-core/src/main/resources/rulesets/releases/670.xml
index 650eb5c783..6d478e135e 100644
--- a/pmd-core/src/main/resources/rulesets/releases/670.xml
+++ b/pmd-core/src/main/resources/rulesets/releases/670.xml
@@ -9,5 +9,7 @@ This ruleset contains links to rules that are new in PMD v6.7.0
   </description>
 
     <rule ref="category/plsql/codestyle.xml/ForLoopNaming"/>
+    <rule ref="category/java/codestyle.xml/LinguisticNaming"/>
+
 </ruleset>
 
diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml
index 1839646a98..de6d95a69c 100644
--- a/pmd-java/src/main/resources/category/java/codestyle.xml
+++ b/pmd-java/src/main/resources/category/java/codestyle.xml
@@ -940,7 +940,7 @@ if (foo) {  // preferred approach
 
     <rule name="LinguisticNaming"
           language="java"
-          since="6.6.0"
+          since="6.7.0"
           message="Linguistics Antipattern - Method name and return type is inconsistent linguistically"
           class="net.sourceforge.pmd.lang.java.rule.codestyle.LinguisticNamingRule"
           externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_codestyle.html#linguisticnaming">