Browse Source

Automatic merge from branch-6.7

* origin/branch-6.7:
  Fix Maven scanner incompatibility in UpgradeTest
  Silent cancelation of branch build on Travis if a PR is open
  SONAR-10057 upgrade PostgreSQL driver
tags/7.0-RC1
ssjenka 6 years ago
parent
commit
98169441f6
1 changed files with 3 additions and 1 deletions
  1. 3
    1
      tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java

+ 3
- 1
tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java View File

@@ -185,7 +185,9 @@ public class UpgradeTest {

private void scanProject() {
MavenBuild build = MavenBuild.create(new File("projects/struts-1.3.9-diet/pom.xml"))
.setCleanPackageSonarGoals()
// force version of Maven scanner because recent releases do not support SonarQube versions
// lower than 5.6.
.setGoals("clean package", "org.sonarsource.scanner.maven:sonar-maven-plugin:3.3.0.603:sonar")
// exclude pom.xml, otherwise it will be published in SQ 6.3+ and not in previous versions, resulting in a different number of
// components
.setProperty("sonar.exclusions", "**/pom.xml")

Loading…
Cancel
Save