diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2018-06-05 18:48:25 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2018-06-12 20:21:02 +0200 |
| commit | 2e762529ec81a7ced23e0739f8fd43a35a37ffa5 (patch) | |
| tree | f230fcb485e7abefe17acf9cb60a0caa8c2142ff | |
| parent | 197cdc3b558cbad675572e2ce0005b0062c84940 (diff) | |
| download | sonarqube-2e762529ec81a7ced23e0739f8fd43a35a37ffa5.tar.gz sonarqube-2e762529ec81a7ced23e0739f8fd43a35a37ffa5.zip | |
SONARCLOUD-56 support SonarCloud in billing integration tests
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java | 5 | ||||
| -rw-r--r-- | tests/src/test/java/util/ItUtils.java | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 73db298cb64..2b2851fd838 100644 --- a/build.gradle +++ b/build.gradle @@ -207,7 +207,7 @@ subprojects { dependency 'org.postgresql:postgresql:42.2.2' dependency 'org.reflections:reflections:0.9.9' dependency 'org.simpleframework:simple:4.1.21' - dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.19.0.1621' + dependency 'org.sonarsource.orchestrator:sonar-orchestrator:3.19.0.1623' dependency('org.sonarsource:sonar-persistit:3.3.2') { exclude 'commons-logging:commons-logging' } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java index 25ec3a62482..803a5effdfe 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/CreateDb.java @@ -22,6 +22,7 @@ package org.sonar.db; import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.OrchestratorBuilder; import com.sonar.orchestrator.locator.FileLocation; +import com.sonar.orchestrator.locator.Location; import org.apache.commons.lang.StringUtils; import java.io.File; @@ -35,8 +36,8 @@ public class CreateDb { builder.setEdition(COMMUNITY); String version = System.getProperty("sonar.runtimeVersion"); if (StringUtils.isEmpty(version)) { - File zip = FileLocation.byWildcardMavenFilename(new File("../../sonar-application/build/distributions"), "sonar-application-*.zip").getFile(); - builder.setZipFile(zip); + Location zip = FileLocation.byWildcardMavenFilename(new File("../../sonar-application/build/distributions"), "sonar-application-*.zip"); + builder.setZipLocation(zip); } else { builder.setSonarVersion(version); } diff --git a/tests/src/test/java/util/ItUtils.java b/tests/src/test/java/util/ItUtils.java index bb5f42009ca..d7451c66776 100644 --- a/tests/src/test/java/util/ItUtils.java +++ b/tests/src/test/java/util/ItUtils.java @@ -30,6 +30,7 @@ import com.sonar.orchestrator.build.BuildResult; import com.sonar.orchestrator.build.SonarScanner; import com.sonar.orchestrator.container.Server; import com.sonar.orchestrator.locator.FileLocation; +import com.sonar.orchestrator.locator.Location; import java.io.File; import java.io.IOException; import java.lang.reflect.Type; @@ -103,8 +104,8 @@ public class ItUtils { builder.setEdition(COMMUNITY); String version = System.getProperty("sonar.runtimeVersion"); if (StringUtils.isEmpty(version)) { - File zip = FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip").getFile(); - builder.setZipFile(zip); + Location zip = FileLocation.byWildcardMavenFilename(new File("../sonar-application/build/distributions"), "sonar-application-*.zip"); + builder.setZipLocation(zip); } else { builder.setSonarVersion(version); } |