]> source.dussan.org Git - sonarqube.git/commitdiff
Remove message about deprecated sonar.branch
authorDuarte Meneses <duarte.meneses@sonarsource.com>
Fri, 8 Sep 2017 13:27:31 +0000 (15:27 +0200)
committerJanos Gyerik <janos.gyerik@sonarsource.com>
Tue, 12 Sep 2017 09:34:59 +0000 (11:34 +0200)
sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
sonar-scanner-engine/src/test/java/org/sonar/scanner/mediumtest/fs/FileSystemMediumTest.java

index edbb9bfd689656b07eb4b0d174e62a10fdc4314e..42311f87b7551e10d59745719fd9526fcbbcc703 100644 (file)
@@ -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);
index 0de22581f630f99cdfe5eb2907008502b8a81131..9a924c9d8ac44b2fd998b7502957a957bb588739 100644 (file)
@@ -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