Merge branch 'hotfix/V2.27.1'

Riverside-Software · Jul 8, 2024 · c8b3ee3 · c8b3ee3
2 parents 8047387 + a41e8f9
commit c8b3ee3
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 25 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.27.0</version>
+    <version>2.27.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>coverage-report</artifactId>
@@ -21,37 +21,37 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
   </dependencies>
 

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.27.0</version>
+    <version>2.27.1</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.27.0</version>
+    <version>2.27.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>

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.27.0</version>
+    <version>2.27.1</version>
   </parent>
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
@@ -23,12 +23,12 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>

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.27.0</version>
+    <version>2.27.1</version>
   </parent>
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
@@ -30,17 +30,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
-  <version>2.27.0</version>
+  <version>2.27.1</version>
   <packaging>pom</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>

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.27.0</version>
+    <version>2.27.1</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.27.0</version>
+    <version>2.27.1</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>proparse</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.27.0</version>
+      <version>2.27.1</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>

diff --git a/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 b/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4
@@ -787,12 +787,12 @@ filenamePart:
   ;
 
 typeName:
-    nonPunctuating ( LEFTANGLE typeName RIGHTANGLE )?
+    nonPunctuating ( LEFTANGLE typeName ( COMMA typeName )* RIGHTANGLE )?
   ;
 
 // Different action in the visitor (no class lookup in typeName2)
 typeName2:
-    nonPunctuating ( LEFTANGLE typeName RIGHTANGLE )?
+    nonPunctuating ( LEFTANGLE typeName ( COMMA typeName )* RIGHTANGLE )?
   ;
 
 // These are necessarily reserved keywords.

diff --git a/proparse/src/test/resources/data/parser/generics01.p b/proparse/src/test/resources/data/parser/generics01.p
@@ -2,7 +2,8 @@ var Progress.Collections.List<Progress.Lang.Object> thelist.
 var Progress.Collections.IIterator<Progress.Lang.Object> iterator.
 var Progress.Lang.Object president1.
 var Progress.Lang.Object president2.
-
+var HashMap<Object, Object> map1.
+
 // Create the list
 thelist = new Progress.Collections.List<Progress.Lang.Object>().
 

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.27.0</version>
+    <version>2.27.1</version>
   </parent>
   <groupId>eu.rssw.openedge.rcode</groupId>
   <artifactId>rcode-reader</artifactId>