]> source.dussan.org Git - sonarqube.git/commit
Automatic merge from branch-6.3
authorJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 3 Mar 2017 07:51:43 +0000 (08:51 +0100)
committerJulien Lancelot <julien.lancelot@sonarsource.com>
Fri, 3 Mar 2017 07:51:43 +0000 (08:51 +0100)
commit2d898468dc31c97922f1757a308bb891bece4140
treee4afb2e3b81754102825f4e724ed6a583eec0075
parentc946c2174c56c7c0463292c5a94e1d542950e028
parentea8d74d2617e334ffbf827ec29a6accb8a7c1cfc
Automatic merge from branch-6.3

* origin/branch-6.3:
  SONAR-8883 Fix Server::getVersion() on scanner side, and reenable IssueJsonReportTest IT
  SONAR-8622 Fix preview mode/JSON report on branches
  Remove javaProperties plugin from PluginsTest
  Remove JSON plugin
  SONAR-8460 Do not fail to write response when profile not found
  SONAR-8460 Remove Errors
  SONAR-8460 Remove creation BadRequestException with Errors
  SONAR-8460 Fix bundled error messages
  SONAR-8460 Simplify creation of BadRequestException with one message
  SONAR-8460 Remove isEmpty from Errors
  SONAR-8460 Remove check from Errors
  SONAR-8460 Remove writeJson from Errors
  fix quality flaw
16 files changed:
server/sonar-server/src/main/java/org/sonar/server/batch/ProjectDataLoader.java
server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java
server/sonar-server/src/main/java/org/sonar/server/measure/custom/ws/CreateAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGates.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ProjectStatusAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java
server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java
server/sonar-server/src/main/java/org/sonar/server/user/UserUpdater.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/GroupWsSupport.java
server/sonar-server/src/main/java/org/sonar/server/usergroups/ws/RemoveUserAction.java
server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java
server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterTest.java