From e01951a63d9493796401cb3f87bf33179265eaab Mon Sep 17 00:00:00 2001
From: Dmitry Kurelchuk <kdaemonv@gmail.com>
Date: Sun, 29 Jan 2017 13:23:22 +0200
Subject: [PATCH 1/2] Use OS independant path separator in checkstyle
 suppressions

---
 pmd-core/pmd-core-checkstyle-suppressions.xml |  4 ++--
 pmd-java/pmd-java-checkstyle-suppressions.xml |  4 ++--
 .../testdata/ExtraTopLevelClass.java          | 22 +++++++++----------
 .../pmd-plsql-checkstyle-suppressions.xml     |  2 +-
 .../pmd-scala-checkstyle-suppressions.xml     |  2 +-
 pmd-vm/pmd-vm-checkstyle-suppressions.xml     |  4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pmd-core/pmd-core-checkstyle-suppressions.xml b/pmd-core/pmd-core-checkstyle-suppressions.xml
index c2a702d851..c1647b6530 100644
--- a/pmd-core/pmd-core-checkstyle-suppressions.xml
+++ b/pmd-core/pmd-core-checkstyle-suppressions.xml
@@ -6,6 +6,6 @@
     <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
 
     <!-- ModifiedControlVariable / JumbledIncrementer -->
-    <suppress checks="ModifiedControlVariable" files="net/sourceforge/pmd/cpd/MatchAlgorithm\.java"/>
-    <suppress checks="ModifiedControlVariable" files="net/sourceforge/pmd/lang/dfa/SequenceChecker\.java"/>
+    <suppress checks="ModifiedControlVariable" files="net[\\/]sourceforge[\\/]pmd[\\/]cpd[\\/]MatchAlgorithm\.java"/>
+    <suppress checks="ModifiedControlVariable" files="net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]dfa[\\/]SequenceChecker\.java"/>
 </suppressions>
\ No newline at end of file
diff --git a/pmd-java/pmd-java-checkstyle-suppressions.xml b/pmd-java/pmd-java-checkstyle-suppressions.xml
index ffaf1adcba..f8ef22bc20 100644
--- a/pmd-java/pmd-java-checkstyle-suppressions.xml
+++ b/pmd-java/pmd-java-checkstyle-suppressions.xml
@@ -5,8 +5,8 @@
 <suppressions>
     <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
 
-    <suppress files="/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java"
+    <suppress files="[\\/]src[\\/]main[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]java[\\/]rule[\\/]AbstractJavaRule\.java"
         checks="AvoidStarImport" />
-    <suppress files="/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java"
+    <suppress files="[\\/]src[\\/]test[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]typeresolution[\\/]testdata[\\/]ExtraTopLevelClass\.java"
         checks="OneTopLevelClass" />
 </suppressions>
\ No newline at end of file
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java
index c3b2625fd7..e70c88fb0e 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java
@@ -1,11 +1,11 @@
-/**
- * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
- */
-
-package net.sourceforge.pmd.typeresolution.testdata;
-
-public class ExtraTopLevelClass {
-}
-
-class TheExtraTopLevelClass { // SUPPRESS CHECKSTYLE explicityl testing two classes in one file
-}
+/**
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.typeresolution.testdata;
+
+public class ExtraTopLevelClass {
+}
+
+class TheExtraTopLevelClass {
+}
diff --git a/pmd-plsql/pmd-plsql-checkstyle-suppressions.xml b/pmd-plsql/pmd-plsql-checkstyle-suppressions.xml
index 384006b0e5..04ce88d835 100644
--- a/pmd-plsql/pmd-plsql-checkstyle-suppressions.xml
+++ b/pmd-plsql/pmd-plsql-checkstyle-suppressions.xml
@@ -5,5 +5,5 @@
 <suppressions>
     <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
 
-    <suppress checks="AvoidStarImport" files="src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java"/>
+    <suppress checks="AvoidStarImport" files="src[\\/]main[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]plsql[\\/]rule[\\/]AbstractPLSQLRule\.java"/>
 </suppressions>
\ No newline at end of file
diff --git a/pmd-scala/pmd-scala-checkstyle-suppressions.xml b/pmd-scala/pmd-scala-checkstyle-suppressions.xml
index 8892166a0c..fea10110f4 100644
--- a/pmd-scala/pmd-scala-checkstyle-suppressions.xml
+++ b/pmd-scala/pmd-scala-checkstyle-suppressions.xml
@@ -6,5 +6,5 @@
     <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
 
     <!-- Part of pmd-scala is under LGPL -->
-    <suppress checks="RegexpHeader" files="org/sonar/plugins/scala/.*"/>
+    <suppress checks="RegexpHeader" files="org[\\/]sonar[\\/]plugins[\\/]scala[\\/].*"/>
 </suppressions>
\ No newline at end of file
diff --git a/pmd-vm/pmd-vm-checkstyle-suppressions.xml b/pmd-vm/pmd-vm-checkstyle-suppressions.xml
index 7714fe5a1f..e9b7fd4134 100644
--- a/pmd-vm/pmd-vm-checkstyle-suppressions.xml
+++ b/pmd-vm/pmd-vm-checkstyle-suppressions.xml
@@ -6,7 +6,7 @@
     <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
 
     <!-- The velocity language is under the Apache License. -->
-    <suppress checks="RegexpHeaderCheck" files="net/sourceforge/pmd/lang/vm/.*"/>
+    <suppress checks="RegexpHeaderCheck" files="net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]vm[\\/].*"/>
 
-    <suppress checks="ModifiedControlVariable" files="src/main/java/net/sourceforge/pmd/lang/vm/ast/NodeUtils.java"/>
+    <suppress checks="ModifiedControlVariable" files="src[\\/]main[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]vm[\\/]ast[\\/]NodeUtils\.java"/>
 </suppressions>
\ No newline at end of file

From 769935ad4c7114814549f4d70f8a30c220aa11e6 Mon Sep 17 00:00:00 2001
From: Dmitry Kurelchuk <kdaemonv@gmail.com>
Date: Sun, 29 Jan 2017 13:24:28 +0200
Subject: [PATCH 2/2] Use OS independant line separator (PMD.EOL) in
 EcmascriptTokenizerTest

---
 .../pmd/cpd/EcmascriptTokenizerTest.java      | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
index 61b1bf8ee3..5f57357387 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
@@ -115,30 +115,30 @@ public class EcmascriptTokenizerTest {
     public void testTemplateStrings() throws IOException {
         Tokenizer t = new EcmascriptTokenizer();
         SourceCode sourceCode = new SourceCode(new SourceCode.StringCodeLoader(
-                  "export default class DrawLocation extends joint.shapes.basic.Generic {\n"
-                + "  constructor(location: ILocation) {\n"
-                + "    this.markup = `<g>\n"
-                + "        <path class=\"location\"/>\n"
-                + "        <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>\n"
-                + "\n"
-                + "        <path class=\"location\"/>\n"
-                + "        <circle class=\"location-circle\"/>\n"
-                + "        ${drawIndicators.Check.markup}\n"
-                + "\n"
-                + "      </g>`;\n"
-                + "  }\n"
-                + "\n"
+                  "export default class DrawLocation extends joint.shapes.basic.Generic {" + PMD.EOL
+                + "  constructor(location: ILocation) {" + PMD.EOL
+                + "    this.markup = `<g>" + PMD.EOL
+                + "        <path class=\"location\"/>" + PMD.EOL
+                + "        <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>" + PMD.EOL
+                + PMD.EOL
+                + "        <path class=\"location\"/>" + PMD.EOL
+                + "        <circle class=\"location-circle\"/>" + PMD.EOL
+                + "        ${drawIndicators.Check.markup}" + PMD.EOL
+                + PMD.EOL
+                + "      </g>`;" + PMD.EOL
+                + "  }" + PMD.EOL
+                + "" + PMD.EOL
                 + "}"));
         final Tokens tokens = new Tokens();
         t.tokenize(sourceCode, tokens);
-        final String templateString = "`<g>\n"
-                + "        <path class=\"location\"/>\n"
-                + "        <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>\n"
-                + "\n"
-                + "        <path class=\"location\"/>\n"
-                + "        <circle class=\"location-circle\"/>\n"
-                + "        ${drawIndicators.Check.markup}\n"
-                + "\n"
+        final String templateString = "`<g>" + PMD.EOL
+                + "        <path class=\"location\"/>" + PMD.EOL
+                + "        <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>" + PMD.EOL
+                + PMD.EOL
+                + "        <path class=\"location\"/>" + PMD.EOL
+                + "        <circle class=\"location-circle\"/>" + PMD.EOL
+                + "        ${drawIndicators.Check.markup}" + PMD.EOL
+                + PMD.EOL
                 + "      </g>`";
         assertEquals(templateString, tokens.getTokens().get(24).toString());
     }