diff options
| author | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2017-11-27 08:02:28 +0100 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2017-11-27 08:02:28 +0100 |
| commit | 98169441f6f81ccc39957e1f820c7104e3d2c000 (patch) | |
| tree | b951bf63b7bcae3925a3763921d2e0abad6c6fda /tests | |
| parent | cf0f94223f4466e53c04bd74861f3432c67d33dd (diff) | |
| parent | f40afe30754c424d94ed14a2c41ade382169b24e (diff) | |
| download | sonarqube-98169441f6f81ccc39957e1f820c7104e3d2c000.tar.gz sonarqube-98169441f6f81ccc39957e1f820c7104e3d2c000.zip | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java index 76f2e28431c..607ef2d4615 100644 --- a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java +++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java @@ -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") |