Merge branch 'release/V2.29.0'

Riverside-Software · Nov 11, 2024 · edca8c8 · edca8c8
2 parents 24c6bdd + f55b6d8
commit edca8c8
Show file tree

Hide file tree

Showing 55 changed files with 1,503 additions and 2,605 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -52,6 +52,11 @@ pipeline {
   }
 
   post {
+    unstable {
+      script {
+        mail body: "Check console output at ${BUILD_URL}/console", to: "[email protected]", subject: "sonar-openedge build is unstable - Branch ${BRANCH_NAME}"
+      }
+    }
     failure {
       script {
         mail body: "Check console output at ${BUILD_URL}/console", to: "[email protected]", subject: "sonar-openedge build failure in Jenkins - Branch ${BRANCH_NAME}"

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.28.3</version>
+    <version>2.29.0</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.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</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.28.3</version>
+    <version>2.29.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.2-jre</version>
+      <version>33.2.1-jre</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>7.8.0</version>
+      <version>7.10.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/deploy.bat b/deploy.bat
@@ -1,2 +1 @@
 xcopy openedge-plugin\target\sonar-openedge-plugin-*.jar %SONAR_HOME%\extensions\downloads /y
-xcopy openedge-plugin\target\sonar-openedge-plugin-*.jar ..\vscode-abl\resources\sonar-openedge-plugin.jar /y
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.28.3</version>
+    <version>2.29.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>
@@ -17,7 +17,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.2-jre</version>
+      <version>33.2.1-jre</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>7.8.0</version>
+      <version>7.10.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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.28.3</version>
+    <version>2.29.0</version>
   </parent>
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
@@ -23,17 +23,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>7.8.0</version>
+      <version>7.10.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

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.28.3</version>
+    <version>2.29.0</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.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.28.3</version>
+      <version>2.29.0</version>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>7.8.0</version>
+      <version>7.10.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/foundation/OpenEdgeSettings.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/foundation/OpenEdgeSettings.java
@@ -744,14 +744,14 @@ private RefactorSession getProparseSession() {
       if (cache != null) {
         sch = cache.getSchemaCache(fileSystem.baseDir().toString());
         if (sch != null) {
-          LOG.info("Reusing database schema from cache for project {}",fileSystem.baseDir().toString());
+          LOG.info("Reusing database schema from cache for project {}",fileSystem.baseDir());
         }
       }
       if (sch == null) {
        sch = readSchema(config.get(Constants.DATABASES).orElse(""),
           config.get(Constants.ALIASES).orElse(""));
        if (cache != null) {
-         LOG.info("Cache database schema for project {}", fileSystem.baseDir().toString());
+         LOG.info("Cache database schema for project {}", fileSystem.baseDir());
          cache.addSchemaCache(fileSystem.baseDir().toString(), sch);
        }
       }

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCodeColorizer.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeCodeColorizer.java
@@ -91,7 +91,8 @@ public void execute(SensorContext context) {
   }
 
   private void highlightFile(SensorContext context, IProparseEnvironment session, InputFile file) {
-    TokenSource stream = new ParseUnit(InputFileUtils.getInputStream(file), InputFileUtils.getRelativePath(file, context.fileSystem()), session, file.charset()).lex();
+    TokenSource stream = new ParseUnit(InputFileUtils.getInputStream(file),
+        InputFileUtils.getRelativePath(file, context.fileSystem()), session, file.charset()).lex();
 
     ProToken tok = (ProToken) stream.nextToken();
     ProToken nextTok = (ProToken) stream.nextToken();
@@ -103,7 +104,8 @@ private void highlightFile(SensorContext context, IProparseEnvironment session,
         textType = TypeOfText.STRING;
       } else if (tok.getNodeType() == ABLNodeType.COMMENT) {
         textType = TypeOfText.COMMENT;
-      } else if (tok.getNodeType().isKeyword()) {
+      } else if (tok.getNodeType().isKeyword()
+          || ((tok.getNodeType() == ABLNodeType.ID) && (ABLNodeType.isFormerUnreservedKeyword(tok.getText())))) {
         textType = TypeOfText.KEYWORD;
       } else if ((tok.getNodeType() == ABLNodeType.INCLUDEDIRECTIVE) || tok.getNodeType().isPreprocessor()) {
         textType = TypeOfText.PREPROCESS_DIRECTIVE;

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java
@@ -398,17 +398,17 @@ private void parseMainFile(SensorContext context, InputFile file, IProparseEnvir
       generateProparseDebugFile(file, unit);
     }
 
-    try {
-      for (Map.Entry<ActiveRule, OpenEdgeProparseCheck> entry : components.getProparseRules().entrySet()) {
+    for (Map.Entry<ActiveRule, OpenEdgeProparseCheck> entry : components.getProparseRules().entrySet()) {
+      try {
         LOG.debug("ActiveRule - Internal key {} - Repository {} - Rule {}", entry.getKey().internalKey(),
             entry.getKey().ruleKey().repository(), entry.getKey().ruleKey().rule());
         startTime = System.currentTimeMillis();
         entry.getValue().sensorExecute(file, unit);
         ruleTime.put(entry.getKey().ruleKey().toString(),
             ruleTime.get(entry.getKey().ruleKey().toString()) + System.currentTimeMillis() - startTime);
+      } catch (RuntimeException caught) {
+        LOG.error("Error during rule execution for " + file, caught);
       }
-    } catch (RuntimeException caught) {
-      LOG.error("Error during rule execution for " + file, caught);
     }
   }
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
-  <version>2.28.3</version>
+  <version>2.29.0</version>
   <packaging>pom</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>
@@ -65,17 +65,17 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.11.0</version>
+          <version>3.13.0</version>
         </plugin>
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.10.0.2594</version>
+          <version>4.0.0.4121</version>
         </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -114,7 +114,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
+            <version>3.3.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -127,7 +127,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.5.0</version>
+            <version>3.8.0</version>
             <configuration>
               <doclint>-missing</doclint>
               <quiet />

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.28.3</version>
+    <version>2.29.0</version>
   </parent>
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>profiler-parser</artifactId>
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr4-runtime</artifactId>
-      <version>4.13.0</version>
+      <version>4.13.2</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>7.8.0</version>
+      <version>7.10.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.antlr</groupId>
         <artifactId>antlr4-maven-plugin</artifactId>
-        <version>4.13.0</version>
+        <version>4.13.2</version>
         <executions>
           <execution>
             <goals>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		xcopy openedge-plugin\target\sonar-openedge-plugin-*.jar %SONAR_HOME%\extensions\downloads /y
		xcopy openedge-plugin\target\sonar-openedge-plugin-*.jar ..\vscode-abl\resources\sonar-openedge-plugin.jar /y