SONAR-1859 Add the boolean property 'sonar.copyPluginProperty'

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml
index f5b33e23db88cb53a0df5c776e089349ba884d1c..a6dd37e73c01cb3ad076ec7780d570e59d74f861 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml
+++ b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml
@@ -235,7 +235,12 @@
     <available property="has.extensions" file="${extensionsDir}"/>
     <antcall target="copy-extensions"/>
 
-    <available file="${pluginArtifact}" property="has.plugin.artifact"/>
+    <condition property="has.plugin.artifact">
+      <and>
+        <available file="${pluginArtifact}" />
+        <istrue value="${copyPluginArtifact}"/>
+      </and>
+    </condition>
     <antcall target="copy-plugin-artifact"/>
 
   </target>

diff --git a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml
index 01fa1ba78442fbe0f5d2d83e037c582e9518caf9..22c7978f48cfcd6c442316ac32dbbc4ff687479c 100644 (file)
--- a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml
+++ b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml
@@ -99,6 +99,15 @@
           <type>java.lang.File</type>
           <defaultValue>${project.build.directory}/${project.build.finalName}.jar</defaultValue>
         </parameter>
+        <parameter>
+          <name>copyPluginArtifact</name>
+          <description>Should copy plugin artifact in Sonar plugins ?</description>
+          <property>copyPluginArtifact</property>
+          <expression>${sonar.copyPluginArtifact}</expression>
+          <required>false</required>
+          <type>java.lang.Boolean</type>
+          <defaultValue>true</defaultValue>
+        </parameter>
         <parameter>
           <name>extensionsDir</name>
           <description>Directory from where extensions should be copied.</description>
@@ -261,6 +270,15 @@
           <type>java.lang.File</type>
           <defaultValue>${project.build.directory}/${project.build.finalName}.jar</defaultValue>
         </parameter>
+        <parameter>
+          <name>copyPluginArtifact</name>
+          <description>Should copy plugin artifact in Sonar plugins ?</description>
+          <property>copyPluginArtifact</property>
+          <expression>${sonar.copyPluginArtifact}</expression>
+          <required>false</required>
+          <type>java.lang.Boolean</type>
+          <defaultValue>true</defaultValue>
+        </parameter>
         <parameter>
           <name>extensionsDir</name>
           <description>Directory from where extensions should be copied.</description>