aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-batch
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2015-12-14 22:20:07 +0100
committerJenkins CI <ci@sonarsource.com>2015-12-14 22:20:07 +0100
commitf63a3ab73d37acef942df261f13ebec7573b4e11 (patch)
treee859e40d91ba1bbe79a37a4f93b9553c3638415c /sonar-batch
parenta4ed263e412aa7fc37d7e5dac4c231acafb1d1d6 (diff)
parent6a13e5f6ed2da5101d33b84849594814351c379a (diff)
downloadsonarqube-f63a3ab73d37acef942df261f13ebec7573b4e11.tar.gz
sonarqube-f63a3ab73d37acef942df261f13ebec7573b4e11.zip
Automatic merge from branch-5.3
* origin/branch-5.3: SONAR-7141 Fail fast if server started with Java 1.6 SONAR-7140 Do not check java.io.tmpdir in bootstrap process SONAR-6905 Batch should dump analysis-related URL into a properties file
Diffstat (limited to 'sonar-batch')
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisher.java2
-rw-r--r--sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisher.java b/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisher.java
index 1d9c4a81145..9944b8b4acd 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisher.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/report/ReportPublisher.java
@@ -224,6 +224,6 @@ public class ReportPublisher implements Startable {
// If server base URL was not configured in Sonar server then is is better to take URL configured on batch side
baseUrl = wsClient.baseUrl();
}
- return baseUrl.replaceAll("(/)+$", "") + "/";
+ return baseUrl.replaceAll("(/)+$", "");
}
}
diff --git a/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java b/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java
index 04c1b4ff161..60d56c5db01 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/report/ReportPublisherTest.java
@@ -81,7 +81,7 @@ public class ReportPublisherTest {
File detailsFile = new File(temp.getRoot(), "report-task.txt");
assertThat(readFileToString(detailsFile)).isEqualTo(
"projectKey=struts\n" +
- "serverUrl=https://localhost/\n" +
+ "serverUrl=https://localhost\n" +
"dashboardUrl=https://localhost/dashboard/index/struts\n" +
"ceTaskId=TASK-123\n" +
"ceTaskUrl=https://localhost/api/ce/task?id=TASK-123\n"
@@ -102,7 +102,7 @@ public class ReportPublisherTest {
File detailsFile = new File(temp.getRoot(), "report-task.txt");
assertThat(readFileToString(detailsFile)).isEqualTo(
"projectKey=struts\n" +
- "serverUrl=https://publicserver/sonarqube/\n" +
+ "serverUrl=https://publicserver/sonarqube\n" +
"dashboardUrl=https://publicserver/sonarqube/dashboard/index/struts\n" +
"ceTaskId=TASK-123\n" +
"ceTaskUrl=https://publicserver/sonarqube/api/ce/task?id=TASK-123\n"