From: Jenkins CI <ci@sonarsource.com>
Date: Thu, 17 Dec 2015 07:01:22 +0000 (+0100)
Subject: Automatic merge from branch-5.3
X-Git-Tag: 5.4-M2~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5c75034675b60ec9a4decaf5ecce49574d987c8e;p=sonarqube.git

Automatic merge from branch-5.3

* origin/branch-5.3:
  open file in the workspace when click on the bubble
  SONAR-7126 Scanner on Java 7 must support TLS 1.2 when connecting to SonarQube HTTPS server
  Add unit test for Java CPD Engine
---

5c75034675b60ec9a4decaf5ecce49574d987c8e
diff --cc server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
index eab0fdb9e0c,fdad62039c1..b85e5c7adbb
--- a/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
+++ b/server/sonar-web/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
@@@ -366,8 -366,8 +366,9 @@@ class Api::ResourcesController < Api::A
  
      json = {
        'id' => resource.id,
 +      'uuid' => resource.uuid,
        'key' => resource.key,
+       'uuid' => resource.uuid,
        'name' => resource.name,
        'scope' => resource.scope,
        'qualifier' => resource.qualifier,