Merge branch 'hotfix/V2.14.8'

Riverside-Software · Feb 22, 2022 · 9dff422 · 9dff422
2 parents 01f3a6a + 83180f9
commit 9dff422
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 11 deletions.
diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>coverage-report</artifactId>

diff --git a/database-parser/pom.xml b/database-parser/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>

diff --git a/listing-parser/pom.xml b/listing-parser/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>

diff --git a/listing-parser/src/main/java/eu/rssw/listing/ListingParser.java b/listing-parser/src/main/java/eu/rssw/listing/ListingParser.java
@@ -21,6 +21,7 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -54,7 +55,9 @@ public ListingParser(Path path, String relativeName) throws IOException {
           "File name shouldn't contain space character - '" + path.toAbsolutePath().toString() + "'");
     }
     this.relativeName = relativeName;
-    try (BufferedReader reader = Files.newBufferedReader(path)) {
+    // Force iso8859-1 encoding so that all crappy characters inserted in the listing will be processed without an exception
+    // We only care about the last part of the file, which doesn't contain non-ASCII characters
+    try (BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.ISO_8859_1)) {
       parseFile(reader);
     }
   }

diff --git a/openedge-checks/pom.xml b/openedge-checks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>

diff --git a/openedge-plugin/pom.xml b/openedge-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
-  <version>2.14.7</version>
+  <version>2.14.8</version>
   <packaging>pom</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>
@@ -24,7 +24,7 @@
   </modules>
 
   <properties>
-    <cabl.version>2.14.7</cabl.version>
+    <cabl.version>2.14.8</cabl.version>
     <sonarqube.version>7.9.6</sonarqube.version>
     <antlr.version>4.9.2</antlr.version>
     <guava.version>31.0.1-jre</guava.version>

diff --git a/profiler-parser/pom.xml b/profiler-parser/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>profiler-parser</artifactId>

diff --git a/proparse/pom.xml b/proparse/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>proparse</artifactId>

diff --git a/rcode-reader/pom.xml b/rcode-reader/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>eu.rssw</groupId>
     <artifactId>sonar-openedge</artifactId>
-    <version>2.14.7</version>
+    <version>2.14.8</version>
   </parent>
   <groupId>eu.rssw.openedge.rcode</groupId>
   <artifactId>rcode-reader</artifactId>