diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-07-27 09:12:49 +0200 |
|---|---|---|
| committer | Janos Gyerik <janos.gyerik@sonarsource.com> | 2017-09-12 10:52:52 +0200 |
| commit | 7515f738fb15473d144dd376fac2a1562486c049 (patch) | |
| tree | cb3730c3af767dcdeb8894499d1f035b3b1ff70a /sonar-scanner-protocol | |
| parent | c8a8f3eee907bf053af6dc6c9decde7de73249b3 (diff) | |
| download | sonarqube-7515f738fb15473d144dd376fac2a1562486c049.tar.gz sonarqube-7515f738fb15473d144dd376fac2a1562486c049.zip | |
SONAR-9616 compute engine backend to support branches
Diffstat (limited to 'sonar-scanner-protocol')
| -rw-r--r-- | sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/ScannerReportViewerApp.java | 2 | ||||
| -rw-r--r-- | sonar-scanner-protocol/src/main/protobuf/scanner_report.proto | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/ScannerReportViewerApp.java b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/ScannerReportViewerApp.java index ed5accc8d00..cc200fe05bc 100644 --- a/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/ScannerReportViewerApp.java +++ b/sonar-scanner-protocol/src/main/java/org/sonar/scanner/protocol/viewer/ScannerReportViewerApp.java @@ -239,7 +239,7 @@ public class ScannerReportViewerApp { } private void updateTitle() { - frame.setTitle(metadata.getProjectKey() + (StringUtils.isNotEmpty(metadata.getBranch()) ? (" (" + metadata.getBranch() + ")") : "") + " " + frame.setTitle(metadata.getProjectKey() + (StringUtils.isNotEmpty(metadata.getBranchName()) ? (" (" + metadata.getBranchName() + ")") : "") + " " + sdf.format(new Date(metadata.getAnalysisDate()))); } diff --git a/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto b/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto index 4cbecc33241..5affc439446 100644 --- a/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto +++ b/sonar-scanner-protocol/src/main/protobuf/scanner_report.proto @@ -33,12 +33,14 @@ message Metadata { string organization_key = 2; // TODO should we keep this project_key here or not ? Because it's a duplication of Component.key string project_key = 3; - string branch = 4; + // maps the property sonar.branch + string deprecated_branch = 4; int32 root_component_ref = 5; bool cross_project_duplication_activated = 6; map<string, QProfile> qprofiles_per_language = 7; map<string, Plugin> plugins_by_key = 8; bool incremental = 9; + string branch_name = 10; message QProfile { string key = 1; |