From: Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Date: Thu, 29 Sep 2016 15:15:46 +0000 (+0200)
Subject: Merge branch 'branch-5.6' into 'branch-6.1'
X-Git-Tag: 6.1-RC2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dd5bbc28c4a18eaa1bfafee46c5fcab5ce812e90;p=sonarqube.git

Merge branch 'branch-5.6' into 'branch-6.1'
---

dd5bbc28c4a18eaa1bfafee46c5fcab5ce812e90
diff --cc it/it-tests/src/test/java/it/plugins/PluginsTest.java
index 423639f1300,767c604bcdb..a9b8bcfbfd1
--- a/it/it-tests/src/test/java/it/plugins/PluginsTest.java
+++ b/it/it-tests/src/test/java/it/plugins/PluginsTest.java
@@@ -66,12 -69,17 +66,15 @@@ public class PluginsTest 
      "lits",
  
      "citymodel",
 -    // status 1.0 is built for Java 8 so it is temporarily disabled
 -    "status",
 -    // temporary incompatibility with cobol 3.1 java.lang.NoClassDefFoundError: com/sonarsource/cobol/api/pp/EnterPreprocessorEvent
 +    // temporary incompatibility with cobol 3.1
 +    // https://jira.sonarsource.com/browse/MAIF-213
      "maifcobolplugin",
  
+     // Waiting for new release of C# and VB.NET plugins, since fxcop was previously part of those plugins => fail with duplicate props
+     "fxcop",
+ 
      // SONAR-7770 Realm plugins cannot be installed as no external configuration is used
 -    "crowd","ldap","pam"
 -  );
 +    "crowd", "ldap", "pam");
  
    static final Set<String> LICENSED_PLUGINS = Sets.newHashSet(
      "abap", "cobol", "cpp", "devcockpit", "governance", "objc", "pli", "plsql", "report", "rpg",