Merge pull request #1649 from guwirth/maven-3.5

use Maven 3.5.4

Author: guwirth

appveyor.yml

@@ -29,7 +29,7 @@ install:
       }
 
       (new-object System.Net.WebClient).DownloadFile(
-        'http://www.us.apache.org/dist/maven/maven-3/3.2.5/binaries/apache-maven-3.2.5-bin.zip',
+        'http://www.us.apache.org/dist/maven/maven-3/3.5.4/binaries/apache-maven-3.5.4-bin.zip',
         'C:\maven-bin.zip'
       )
       [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
@@ -62,9 +62,9 @@ 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-scanner\sonar-scanner-3.2.0.1227\bin;%PATH%
-  - cmd: SET M2_HOME=C:\maven\apache-maven-3.2.5
-  - cmd: SET MAVEN_HOME=C:\maven\apache-maven-3.2.5
+  - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;C:\sonar-scanner\sonar-scanner-3.2.0.1227\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.6
   - cmd: SET TestDataFolder=C:\projects\sonar-cxx\integration-tests\testdata
   - cmd: SET
@@ -82,15 +82,13 @@ 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.2.2.%APPVEYOR_BUILD_NUMBER%
   - mvn org.jacoco:jacoco-maven-plugin:prepare-agent clean install -B -e -V -Pcoverage-per-test
   - 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%)
   - C:\Python27\Scripts\behave.exe --no-capture --tags=SqApi67
-  - del /S /Q *-SNAPSHOT-sources.jar
+  - del /S /Q *-sources.jar
   - del /S /Q original-*.jar
-  - ren sonar-cxx-plugin\target\*-SNAPSHOT.jar sonar-cxx-plugin-?.?.?.%APPVEYOR_BUILD_NUMBER%.jar
-  - ren sonar-c-plugin\target\*-SNAPSHOT.jar sonar-c-plugin-?.?.?.%APPVEYOR_BUILD_NUMBER%.jar
-  - ren sslr-cxx-toolkit\target\*-SNAPSHOT.jar sslr-cxx-toolkit-?.?.?.%APPVEYOR_BUILD_NUMBER%.jar
 
 #---------------------------------#
 #      artifacts configuration    #

integration-tests/features/environment.py

@@ -38,12 +38,12 @@
 SONAR_URL = "http://localhost:9000"
 INDENT = "    "
 BASEDIR = os.path.dirname(os.path.realpath(__file__))
-JAR_CXX_PATTERN1 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*SNAPSHOT.jar")
-JAR_CXX_PATTERN2 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*RC?.jar")
-JAR_CXX_PATTERN3 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*-?.?.?.jar")
-JAR_C_PATTERN1 = os.path.join(BASEDIR, "../../sonar-c-plugin/target/*SNAPSHOT.jar")
-JAR_C_PATTERN2 = os.path.join(BASEDIR, "../../sonar-c-plugin/target/*RC?.jar")
-JAR_C_PATTERN3 = os.path.join(BASEDIR, "../../sonar-c-plugin/target/*-?.?.?.jar")
+JAR_CXX_PATTERN1 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*[0-9].jar")
+JAR_CXX_PATTERN2 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*SNAPSHOT.jar")
+JAR_CXX_PATTERN3 = os.path.join(BASEDIR, "../../sonar-cxx-plugin/target/*RC[0-9].jar")
+JAR_C_PATTERN1 = os.path.join(BASEDIR, "../../sonar-c-plugin/target/*[0-9].jar")
+JAR_C_PATTERN2 = os.path.join(BASEDIR, "../../sonar-c-plugin/target/*SNAPSHOT.jar")
+JAR_C_PATTERN3 = os.path.join(BASEDIR, "../../sonar-c-plugin/target/*RC[0-9].jar")
 RELPATH_PLUGINS = "extensions/plugins"
 didstartsonar = False
 

pom.xml

@@ -374,7 +374,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.0</version>
+          <version>2.22.1</version>
         </plugin>
         <plugin>
           <groupId>com.mycila</groupId>
@@ -384,7 +384,7 @@
         <plugin>
           <groupId>org.sonarsource.scanner.maven</groupId>
           <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.4.0.905</version>
+          <version>3.5.0.1254</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -397,7 +397,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.0</version>
         <configuration>
           <showDeprecation>true</showDeprecation>
         </configuration>