diff options
-rw-r--r-- | subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.build.xml | 7 | ||||
-rw-r--r-- | subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml | 18 |
2 files changed, 24 insertions, 1 deletions
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 f5b33e23db8..a6dd37e73c0 100644 --- 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 01fa1ba7844..22c7978f48c 100644 --- a/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml +++ b/subprojects/sonar-dev-maven-plugin/src/main/scripts/dev.mojos.xml @@ -100,6 +100,15 @@ <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> <property>extensionsDir</property> @@ -262,6 +271,15 @@ <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> <property>extensionsDir</property> |