SONAR-8646 Embed SonarFlex

diff --git a/pom.xml b/pom.xml
index 8a671e43a6a176f55fad94405e8edfdd32f8134e..17540340f5950894a19abf27f3c1341b5cb59115 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,6 @@
   <properties>
     <!-- see http://repo1.maven.org/maven2/org/sonarsource/dotnet/sonar-csharp-plugin/ -->
     <sonarCSharp.version>5.7.0.612</sonarCSharp.version>
-    <sonarGit.version>1.2</sonarGit.version>
     <!-- see http://repo1.maven.org/maven2/org/sonarsource/java/sonar-java-plugin/ -->
     <sonarJava.version>4.5.0.8398</sonarJava.version>
     <!-- see http://repo1.maven.org/maven2/org/sonarsource/javascript/sonar-javascript-plugin/ -->
@@ -58,6 +57,9 @@
     <sonarPhp.version>2.9.1.1705</sonarPhp.version>
     <!-- see http://repo1.maven.org/maven2/org/sonarsource/python/sonar-python-plugin/ -->
     <sonarPython.version>1.7.0.1195</sonarPython.version>
+    <!-- http://repo1.maven.org/maven2/org/sonarsource/flex/sonar-flex-plugin/ -->
+    <sonarFlex.version>2.3</sonarFlex.version>
+    <sonarGit.version>1.2</sonarGit.version>
     <sonarSvn.version>1.4.0.522</sonarSvn.version>
     <sonarUpdateCenter.version>1.17</sonarUpdateCenter.version>
     <h2.version>1.3.176</h2.version>
@@ -647,6 +649,26 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>org.sonarsource.flex</groupId>
+        <artifactId>sonar-flex-plugin</artifactId>
+        <version>${sonarFlex.version}</version>
+        <type>sonar-plugin</type>
+        <exclusions>
+          <!--
+          no need for transitive dependencies as only the JAR file
+          is needed for the zip bundle
+          -->
+          <exclusion>
+            <groupId>org.sonarsource.flex</groupId>
+            <artifactId>flex-squid</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.sonarsource.flex</groupId>
+            <artifactId>flex-checks</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>net.java.dev.jna</groupId>
         <artifactId>jna</artifactId>

diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index c7c4f47e6279968bca3346b13153520cef31df91..bdaffdd326fdb5faa953ab1c4b50947801937074 100644 (file)
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -138,6 +138,12 @@
       <type>sonar-plugin</type>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.sonarsource.flex</groupId>
+      <artifactId>sonar-flex-plugin</artifactId>
+      <type>sonar-plugin</type>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <!-- do not upgrade because of licensing change -->
       <groupId>tanukisoft</groupId>
@@ -230,8 +236,8 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <minsize>110000000</minsize>
-                  <maxsize>117000000</maxsize>
+                  <minsize>111000000</minsize>
+                  <maxsize>118000000</maxsize>
                   <files>
                     <file>${project.build.directory}/sonarqube-${project.version}.zip</file>
                   </files>