From a0ff3c4c80d659bf766ed73ee4a27a3b86e7abbe Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Fri, 8 Sep 2017 15:27:31 +0200 Subject: [PATCH] Remove message about deprecated sonar.branch --- .../main/java/org/sonar/scanner/scan/ProjectScanContainer.java | 1 - .../org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java index edbb9bfd689..42311f87b75 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java @@ -235,7 +235,6 @@ public class ProjectScanContainer extends ComponentContainer { String branch = tree.root().definition().getBranch(); if (branch != null) { LOG.info("Branch key: {}", branch); - LOG.warn("The use of \"sonar.branch\" is deprecated and replaced by \"sonar.branch.name\". See https://redirect.sonarsource.com/doc/branches.html."); } String branchName = props.property(ScannerProperties.BRANCH_NAME); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java index 0de22581f63..9a924c9d8ac 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java @@ -164,7 +164,6 @@ public class FileSystemMediumTest { assertThat(logs.getAllAsString()).contains("Project key: com.foo.project"); assertThat(logs.getAllAsString()).contains("Branch key: my-branch"); - assertThat(logs.getAllAsString()).contains("The use of \"sonar.branch\" is deprecated and replaced by \"sonar.branch.name\"."); } @Test -- 2.39.5