Merge "Allow SONAR_MAVEN_GOAL to be configurable"

diff --combined .jjb-test/expected-xml/gerrit-maven-sonar
index e48e5e3,cf178aa..8acf049
--- 1/.jjb-test/expected-xml/gerrit-maven-sonar
--- 2/.jjb-test/expected-xml/gerrit-maven-sonar
+++ b/.jjb-test/expected-xml/gerrit-maven-sonar
@@@ -100,13 -100,21 +100,21 @@@ For example '<1.0.0' or '>=1.0.0,
            <name>STAGING_PROFILE_ID</name>
            <description>Nexus staging profile ID.
  </description>
-           <defaultValue>uuddlrlrba</defaultValue>
+           <defaultValue/>
          </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>ARCHIVE_ARTIFACTS</name>
            <description>Artifacts to archive to the logs server.</description>
            <defaultValue/>
          </hudson.model.StringParameterDefinition>
+         <hudson.model.StringParameterDefinition>
+           <name>SONAR_MAVEN_GOAL</name>
+           <description>Maven goals to pass to the Sonar call. Typically sonar:sonar
+ however to use a specific version of the sonar-maven-plugin we
+ can call &quot;org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar&quot;.
+ </description>
+           <defaultValue>sonar:sonar</defaultValue>
+         </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
    </properties>
@@@ -220,9 -228,7 +228,7 @@@
      </hudson.tasks.Shell>
      <EnvInjectBuilder>
        <info>
-         <propertiesContent>SONAR_HOST_URL=$SONAR_URL
- SONAR_MAVEN_GOAL=sonar:sonar
- </propertiesContent>
+         <propertiesContent>SONAR_HOST_URL=$SONAR_URL</propertiesContent>
        </info>
      </EnvInjectBuilder>
      <org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep plugin="config-file-provider">
@@@ -291,7 -297,7 +297,7 @@@ $MVN clean deploy 
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      -DaltDeploymentRepository=staging::default::file:&quot;$WORKSPACE&quot;/m2repo \
 -    $MAVEN_PARAMS $MAVEN_OPTIONS
 +    $MAVEN_OPTIONS $MAVEN_PARAMS
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
  # shellcheck disable=SC2086
@@@ -300,7 -306,7 +306,7 @@@ $MVN $SONAR_MAVEN_GOAL 
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      -DaltDeploymentRepository=staging::default::file:&quot;$WORKSPACE&quot;/m2repo \
 -    $MAVEN_PARAMS $MAVEN_OPTIONS
 +    $MAVEN_OPTIONS $MAVEN_PARAMS
  </command>
      </hudson.tasks.Shell>
      <hudson.tasks.Shell>

diff --combined .jjb-test/expected-xml/github-maven-sonar
index 13a3a85,dac8f70..713ccb3
--- 1/.jjb-test/expected-xml/github-maven-sonar
--- 2/.jjb-test/expected-xml/github-maven-sonar
+++ b/.jjb-test/expected-xml/github-maven-sonar
@@@ -95,13 -95,21 +95,21 @@@ For example '<1.0.0' or '>=1.0.0,
            <name>STAGING_PROFILE_ID</name>
            <description>Nexus staging profile ID.
  </description>
-           <defaultValue>uuddlrlrba</defaultValue>
+           <defaultValue/>
          </hudson.model.StringParameterDefinition>
          <hudson.model.StringParameterDefinition>
            <name>ARCHIVE_ARTIFACTS</name>
            <description>Artifacts to archive to the logs server.</description>
            <defaultValue/>
          </hudson.model.StringParameterDefinition>
+         <hudson.model.StringParameterDefinition>
+           <name>SONAR_MAVEN_GOAL</name>
+           <description>Maven goals to pass to the Sonar call. Typically sonar:sonar
+ however to use a specific version of the sonar-maven-plugin we
+ can call &quot;org.codehaus.mojo:sonar-maven-plugin:3.3.0.603:sonar&quot;.
+ </description>
+           <defaultValue>sonar:sonar</defaultValue>
+         </hudson.model.StringParameterDefinition>
        </parameterDefinitions>
      </hudson.model.ParametersDefinitionProperty>
    </properties>
@@@ -185,9 -193,7 +193,7 @@@
      </hudson.tasks.Shell>
      <EnvInjectBuilder>
        <info>
-         <propertiesContent>SONAR_HOST_URL=$SONAR_URL
- SONAR_MAVEN_GOAL=sonar:sonar
- </propertiesContent>
+         <propertiesContent>SONAR_HOST_URL=$SONAR_URL</propertiesContent>
        </info>
      </EnvInjectBuilder>
      <org.jenkinsci.plugins.configfiles.builder.ConfigFileBuildStep plugin="config-file-provider">
@@@ -256,7 -262,7 +262,7 @@@ $MVN clean deploy 
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      -DaltDeploymentRepository=staging::default::file:&quot;$WORKSPACE&quot;/m2repo \
 -    $MAVEN_PARAMS $MAVEN_OPTIONS
 +    $MAVEN_OPTIONS $MAVEN_PARAMS
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
  # shellcheck disable=SC2086
@@@ -265,7 -271,7 +271,7 @@@ $MVN $SONAR_MAVEN_GOAL 
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      -DaltDeploymentRepository=staging::default::file:&quot;$WORKSPACE&quot;/m2repo \
 -    $MAVEN_PARAMS $MAVEN_OPTIONS
 +    $MAVEN_OPTIONS $MAVEN_PARAMS
  </command>
      </hudson.tasks.Shell>
      <hudson.tasks.Shell>