SONAR-7261 Embed JavaScript and C# plugins

And use latest version of the Java plugin

diff --git a/pom.xml b/pom.xml
index 25cfa3d56535d52041329547e250304cc2bcdb03..42262c40460ebf97f395efe03edc29c600c4203d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,9 @@
 
   <properties>
     <sonarUpdateCenter.version>1.13</sonarUpdateCenter.version>
-    <sonarJava.version>3.7.1</sonarJava.version>
+    <sonarJava.version>3.9</sonarJava.version>
+    <sonarJavaScript.version>2.10</sonarJavaScript.version>
+    <sonarCSharp.version>4.4</sonarCSharp.version>
     <sonarGit.version>1.0</sonarGit.version>
     <sonarSvn.version>1.2</sonarSvn.version>
     <h2.version>1.3.176</h2.version>
@@ -530,6 +532,7 @@
         <artifactId>sonar-java-plugin</artifactId>
         <version>${sonarJava.version}</version>
         <type>sonar-plugin</type>
+        <!--<scope>provided</scope>-->
         <exclusions>
           <!-- A banned dependency is bring because java-squid is using maven-project:2.07
           This exclusion should be removed when the plugin will no more used maven-project -->
@@ -537,8 +540,25 @@
             <groupId>classworlds</groupId>
             <artifactId>classworlds</artifactId>
           </exclusion>
+          <!-- The mockito version of the Java plugin is not compatible with the mockito version used in SonarQube -->
+          <exclusion>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.sonarsource.javascript</groupId>
+        <artifactId>sonar-javascript-plugin</artifactId>
+        <version>${sonarJavaScript.version}</version>
+        <type>sonar-plugin</type>
+      </dependency>
+      <dependency>
+        <groupId>org.sonarsource.dotnet</groupId>
+        <artifactId>sonar-csharp-plugin</artifactId>
+        <version>${sonarCSharp.version}</version>
+        <type>sonar-plugin</type>
+      </dependency>
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>

diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index 6de392b1782c85db6c63184452536b5a705d8235..adda8bf3227df28298198fee054402a9048c2027 100644 (file)
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -91,6 +91,18 @@
       <type>sonar-plugin</type>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.javascript</groupId>
+      <artifactId>sonar-javascript-plugin</artifactId>
+      <type>sonar-plugin</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.dotnet</groupId>
+      <artifactId>sonar-csharp-plugin</artifactId>
+      <type>sonar-plugin</type>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.sonar-plugins</groupId>
       <artifactId>sonar-scm-git-plugin</artifactId>
@@ -220,8 +232,8 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <minsize>100000000</minsize>
-                  <maxsize>115000000</maxsize>
+                  <minsize>105000000</minsize>
+                  <maxsize>120000000</maxsize>
                   <files>
                     <file>${project.build.directory}/sonarqube-${project.version}.zip</file>
                   </files>