cxx 1.3.3

- update SQ and scanner versions - fix bug in Visual Studio coverage scanner - test with 8.x versions
SonarOpenCommunity · Jun 7, 2020 · 6e5cb2d · 6e5cb2d
1 parent 6dd6f74
commit 6e5cb2d
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 27 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,15 +8,29 @@ jdk:
   - openjdk11
 env:
   - SONARLABEL=sonarqube-6.7.7 SONARAPI=SqApi67
-  - SONARLABEL=sonarqube-7.9.2 SONARAPI=SqApi79
+  - SONARLABEL=sonarqube-7.9.3 SONARAPI=SqApi79
+  - SONARLABEL=sonarqube-8.0 SONARAPI=SqApi79
+  - SONARLABEL=sonarqube-8.1.0.31237 SONARAPI=SqApi79
+  - SONARLABEL=sonarqube-8.2.0.32929 SONARAPI=SqApi79
+
 matrix:
   exclude:
     - jdk: oraclejdk8
-      env: SONARLABEL=sonarqube-7.9.2 SONARAPI=SqApi79
+      env: SONARLABEL=sonarqube-7.9.3 SONARAPI=SqApi79
+    - jdk: oraclejdk8
+      env: SONARLABEL=sonarqube-8.0 SONARAPI=SqApi79
+    - jdk: oraclejdk8
+      env: SONARLABEL=sonarqube-8.1.0.31237 SONARAPI=SqApi79
+    - jdk: oraclejdk8
+      env: SONARLABEL=sonarqube-8.2.0.32929 SONARAPI=SqApi79
+  allow_failures:
+    - env: SONARLABEL=sonarqube-8.0 SONARAPI=SqApi79
+    - env: SONARLABEL=sonarqube-8.1.0.31237 SONARAPI=SqApi79
+    - env: SONARLABEL=sonarqube-8.2.0.32929 SONARAPI=SqApi79
 
 branches:
   only:
-    - master
+    - /^(?i:master).*$/
 
 # shorten the VM hostname with the new workaround
 # https://github.com/travis-ci/travis-ci/issues/5227#issuecomment-165131913
@@ -51,8 +65,8 @@ install:
   - pushd /tmp
   - wget -nv --timeout=10 https://binaries.sonarsource.com/Distribution/sonarqube/$SONARLABEL.zip
   - unzip -qq $SONARLABEL.zip
-  - wget -nv --timeout=10 https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873.zip
-  - unzip -qq sonar-scanner-cli-4.2.0.1873.zip
+  - wget -nv --timeout=10 https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.3.0.2102.zip
+  - unzip -qq sonar-scanner-cli-4.3.0.2102.zip
   - wget -nv --timeout=10 https://github.com/htacg/tidy-html5/archive/5.6.0.zip --output-document=tidy-html5.zip
   - unzip -qq tidy-html5.zip
   - pushd tidy-html5-5.6.0/build/cmake/
@@ -70,7 +84,7 @@ script:
   - mvn install -B -e -V -DskipTests=true
   - mvn test -B -e -V
   - bash cxx-sensors/src/tools/check_rules.sh
-  - RAILS_ENV=production PATH=$PATH:/tmp/sonar-scanner-4.2.0.1873/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture --tags=$SONARAPI
+  - RAILS_ENV=production PATH=$PATH:/tmp/sonar-scanner-4.3.0.2102/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture --tags=$SONARAPI
 
 after_failure:
   - cat $SONARHOME/logs/sonar.log

diff --git a/appveyor.yml b/appveyor.yml
@@ -36,7 +36,7 @@ install:
 
       if (!(Test-Path -Path "C:\sonar-scanner" )) {
         (new-object System.Net.WebClient).DownloadFile(
-          'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873.zip',
+          'https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.3.0.2102.zip',
           'C:\sonar-scanner-dist.zip'
         )
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sonar-scanner-dist.zip", "C:\sonar-scanner")
@@ -62,7 +62,7 @@ install:
         $env:VCVARS_PLATFORM="amd64"
         $env:LANG_PLATFORM="-x64"
       }
-  - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;C:\sonar-scanner\sonar-scanner-4.2.0.1873\bin;%PATH%
+  - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;C:\sonar-scanner\sonar-scanner-4.3.0.2102\bin;%PATH%
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.5.4
   - cmd: SET MAVEN_HOME=C:\maven\apache-maven-3.5.4
   - cmd: SET SONARHOME=C:\sonarqube\sonarqube-6.7.7
@@ -82,7 +82,7 @@ build_script:
   - C:\Python27\Scripts\pip.exe install requests
   - C:\Python27\Scripts\pip.exe install behave
   - C:\Python27\Scripts\pip.exe install colorama
-  - mvn versions:set -DnewVersion=1.3.2.%APPVEYOR_BUILD_NUMBER%
+  - mvn versions:set -DnewVersion=1.3.3.%APPVEYOR_BUILD_NUMBER%
   - mvn clean install -B -e -V
   - IF "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" (mvn sonar:sonar -B -e -V -Dsonar.organization=sonaropencommunity -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=%sonarcloudtoken%)
   - REM IF NOT "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" (mvn sonar:sonar -B -e -X -V -Dsonar.verbose=true -Dsonar.pullrequest.base=master -Dsonar.pullrequest.branch=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH% -Dsonar.pullrequest.key=%APPVEYOR_PULL_REQUEST_NUMBER% -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.repository=%APPVEYOR_PROJECT_SLUG%)

diff --git a/cxx-checks/pom.xml b/cxx-checks/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>cxx-checks</artifactId>
@@ -15,7 +15,7 @@
   <properties>
     <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/cxx-sensors/pom.xml b/cxx-sensors/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>cxx-sensors</artifactId>

diff --git a/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/VisualStudioParser.java b/cxx-sensors/src/main/java/org/sonar/cxx/sensors/coverage/VisualStudioParser.java
@@ -65,6 +65,9 @@ private static void collectSourceFileMeasures(SMInputCursor sourceFiles, Map<Str
     while (sourceFile.getNext() != null) {
       String id = sourceFile.getAttrValue("id");
       CoverageMeasures builder = coverageData.remove(id);
+      if (builder == null) {
+        builder = CoverageMeasures.create();
+      }
       // replace id with path
       coverageData.put(sourceFile.getAttrValue("path"), builder);
     }

diff --git a/cxx-squid/pom.xml b/cxx-squid/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>cxx-squid</artifactId>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>integration-tests</artifactId>
@@ -19,9 +19,9 @@
   </properties>
 
   <dependencies>
-    
-     <!-- set dependencies to aggregate coverage results -->
-     
+
+    <!-- set dependencies to aggregate coverage results -->
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>cxx-checks</artifactId>
@@ -31,7 +31,7 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>cxx-sensors</artifactId>
       <version>${project.version}</version>
-    </dependency>         
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>cxx-squid</artifactId>
@@ -47,7 +47,7 @@
       <artifactId>sonar-cxx-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
-    
+
     <!-- https://mvnrepository.com/artifact/io.cucumber/cucumber-jvm-deps -->
 
     <!-- https://mvnrepository.com/artifact/io.cucumber/gherkin -->
@@ -166,7 +166,7 @@
             </execution>
           </executions>
         </plugin>
-       <plugin>
+        <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
           <executions>

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
   <artifactId>cxx</artifactId>
-  <version>1.3.2-SNAPSHOT</version>
+  <version>1.3.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Cxx</name>
@@ -379,7 +379,7 @@
         <artifactId>guava</artifactId>
         <version>19.0</version>
       </dependency>
-      </dependencies>
+    </dependencies>
   </dependencyManagement>
   <build>
     <!-- To define the plugin version in your parent POM -->
@@ -414,7 +414,7 @@
           <groupId>com.mycila</groupId>
           <artifactId>license-maven-plugin</artifactId>
           <version>3.0</version>
-        </plugin> 
+        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>

diff --git a/sonar-c-plugin/pom.xml b/sonar-c-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
 
@@ -23,7 +23,7 @@
     <sonar.artifact.path>target/${project.artifactId}-${project.version}.jar</sonar.artifact.path>
     <sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>

diff --git a/sonar-cxx-plugin/pom.xml b/sonar-cxx-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>sonar-cxx-plugin</artifactId>

diff --git a/sslr-cxx-toolkit/pom.xml b/sslr-cxx-toolkit/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.sonarsource.sonarqube-plugins.cxx</groupId>
     <artifactId>cxx</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>sslr-cxx-toolkit</artifactId>