Merge pull request #824 from SonarOpenCommunity/sonar-runner-2.5.1

use latest sonar runner 2.5.1
SonarOpenCommunity · Apr 7, 2016 · 122a44c · 122a44c
2 parents c81c26d + 153299d
commit 122a44c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,8 +26,8 @@ install:
         - unzip -qq sonarqube-5.3.zip
         - travis_retry wget -q https://sonarsource.bintray.com/Distribution/sonarqube/sonarqube-5.4.zip
         - unzip -qq sonarqube-5.4.zip		
-        - travis_retry wget -q http://repo1.maven.org/maven2/org/codehaus/sonar/runner/sonar-runner-dist/2.4/sonar-runner-dist-2.4.zip
-        - unzip -qq sonar-runner-dist-2.4.zip
+        - travis_retry wget -q https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-2.5.1.zip
+        - unzip -qq sonar-scanner-2.5.1.zip
         - cd -
 
 before_script:
@@ -38,7 +38,7 @@ before_script:
 script:
         - mvn install -DskipTests=true
         - mvn test
-        - RAILS_ENV=production PATH=$PATH:/tmp/sonar-runner-2.4/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture
+        - RAILS_ENV=production PATH=$PATH:/tmp/sonar-scanner-2.5.1/bin TestDataFolder=~/build/SonarOpenCommunity/sonar-cxx/integration-tests/testdata behave --no-capture
 
 after_failure:
         - cat $SONARHOME/logs/sonar.log

diff --git a/appveyor.yml b/appveyor.yml
@@ -11,7 +11,7 @@ install:
       }
       if (!(Test-Path -Path "C:\sonar-runner" )) {
         (new-object System.Net.WebClient).DownloadFile(
-          'http://repo1.maven.org/maven2/org/codehaus/sonar/runner/sonar-runner-dist/2.4/sonar-runner-dist-2.4.zip',
+          'https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-2.5.1.zip',
           'C:\sonar-runner-dist.zip'
         )
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\sonar-runner-dist.zip", "C:\sonar-runner")
@@ -37,7 +37,7 @@ install:
         $env:VCVARS_PLATFORM="amd64"
         $env:LANG_PLATFORM="-x64"
       }	  
-  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;C:\sonar-runner\sonar-runner-2.4\bin;%PATH%
+  - cmd: SET PATH=C:\maven\apache-maven-3.2.5\bin;%JAVA_HOME%\bin;C:\sonar-runner\sonar-scanner-2.5.1\bin;%PATH%
   - cmd: SET SONARHOME=C:\sonarqube-5.4\sonarqube-5.4
   - cmd: SET TestDataFolder=C:\projects\sonar-cxx\integration-tests\testdata
   - cmd: SET

diff --git a/integration-tests/features/importing_cppcheck_reports.feature b/integration-tests/features/importing_cppcheck_reports.feature
@@ -32,7 +32,7 @@ Feature: Importing Cppcheck reports
          AND the server log (if locatable) contains no error/warning messages
          BUT the analysis log contains a line matching
               """
-              .*WARN.*The report '.*' seems to be empty, ignoring.
+              .*INFO.*The report '.*' seems to be empty, ignoring.
               """
          AND the number of violations fed is 0
 
@@ -58,7 +58,7 @@ Feature: Importing Cppcheck reports
          AND the server log (if locatable) contains no error/warning messages
          BUT the analysis log contains a line matching
               """
-              .*ERROR - Report .* cannot be parsed
+              .*ERROR.*Report .* cannot be parsed
               """
          AND the number of violations fed is <violations>
 
@@ -76,7 +76,7 @@ Feature: Importing Cppcheck reports
          AND the server log (if locatable) contains no error/warning messages
          BUT the analysis log contains a line matching
               """
-              .*WARN.* Cannot find the file .* skipping violations
+              .*INFO.*Cannot find the file .* skipping violations
               """
          AND the number of violations fed is 0
 

diff --git a/integration-tests/features/multimodule_analysis.feature b/integration-tests/features/multimodule_analysis.feature
@@ -12,13 +12,13 @@ Feature: cpp-multimodule-project
               .*WARN.*Unable to get a valid mac address, will use a dummy address
               .*WARN.*cannot find the sources for '#include <gtest/gtest\.h>'
               .*WARN.*cannot find the sources for '#include <iostream>'
-              .*WARN  - Cannot find the file '.*', skipping violations
+              .*WARN-*Cannot find the file '.*', skipping violations
               .*WARN.*to create a dependency with .*
-              .*WARN  - the include root '.*' doesn't exist
-              .*WARN  - .* cannot find the sources for .*
-              .*WARN  - SCM provider autodetection failed.*
+              .*WARN.*the include root '.*' doesn't exist
+              .*WARN.* cannot find the sources for .*
+              .*WARN.*SCM provider autodetection failed.*
               .*WARN.*Cannot find a report for '.*'
-              .*WARN.*- File access Failed '.*'
+              .*WARN.*File access Failed '.*'
               .*ERROR.*Invalid report baseDir '.*'
               .*ERROR.*Using module base failed to find Path '.*'
               """

diff --git a/integration-tests/features/multimodule_analysis_2.feature b/integration-tests/features/multimodule_analysis_2.feature
@@ -15,14 +15,14 @@ Feature: cpp-multimodule-project
               .*WARN.*Unable to get a valid mac address, will use a dummy address
               .*WARN.*cannot find the sources for '#include <gtest/gtest\.h>'
               .*WARN.*cannot find the sources for '#include <iostream>'
-              .*WARN  - Cannot find the file '.*', skipping violations
+              .*WARN.*Cannot find the file '.*', skipping violations
               .*WARN.*to create a dependency with .*
-              .*WARN  - the include root '.*' doesn't exist
-              .*WARN  - .* cannot find the sources for .*
-              .*WARN  - SCM provider autodetection failed.*
+              .*WARN.*the include root '.*' doesn't exist
+              .*WARN.* cannot find the sources for .*
+              .*WARN.*SCM provider autodetection failed.*
               .*WARN.*Cannot find a report for '.*'
-              .*WARN.*- File access Failed '.*'
-              .*WARN.* A multi-module project can't have source folders, so '.*'
+              .*WARN.*File access Failed '.*'
+              .*WARN.*A multi-module project can't have source folders, so '.*'
               .*ERROR.*Invalid report baseDir '.*'
               .*ERROR.*Using module base failed to find Path '.*'
               """

diff --git a/integration-tests/features/test_execution_statistics.feature b/integration-tests/features/test_execution_statistics.feature
@@ -141,7 +141,7 @@ Feature: Providing test execution numbers
           AND the analysis in server has completed
           AND the analysis log contains a line matching:
               """
-              .*ERROR - The property 'sonar.tests' is unset. Please set it to proceed
+              .*ERROR.*The property 'sonar.tests' is unset. Please set it to proceed
               """
           AND the test related metrics have following values: <values>
 
@@ -218,7 +218,7 @@ Feature: Providing test execution numbers
        THEN the analysis breaks
            AND the analysis log contains a line matching:
                """
-               ERROR.*Cannot feed the data into SonarQube, details: .*
+               .*ERROR.*Cannot feed the data into SonarQube, details: .*
                """
 
   # =================