Merge "Add install goal to javadoc job"
authorJeremy Phelps <jphelps@linuxfoundation.org>
Tue, 7 Nov 2017 17:46:35 +0000 (17:46 +0000)
committerGerrit Code Review <gerrit@linuxfoundation.org>
Tue, 7 Nov 2017 17:46:35 +0000 (17:46 +0000)
1  2 
.jjb-test/expected-xml/gerrit-maven-maven-javadoc-publish-master
.jjb-test/expected-xml/gerrit-maven-maven-javadoc-verify-master
.jjb-test/expected-xml/github-maven-maven-javadoc-publish-master
.jjb-test/expected-xml/github-maven-maven-javadoc-verify-master

@@@ -313,7 -313,11 +313,11 @@@ export MAVEN_OPT
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
  # shellcheck disable=SC2086
- $MVN clean javadoc:aggregate \
+ $MVN clean install javadoc:aggregate \
+     -Pq -Dmaven.javadoc.skip=false \
+     -DskipTests=true \
+     -Dcheckstyle.skip=true \
+     -Dfindbugs.skip=true \
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      $MAVEN_PARAMS $MAVEN_OPTIONS
@@@ -726,14 -730,5 +730,14 @@@ rm ~/.netr
        <user>test-credential</user>
      </com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
      <jenkins.plugins.openstack.compute.JCloudsOneOffSlave/>
 +    <org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper plugin="config-file-provider">
 +      <managedFiles>
 +        <org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +          <fileId>npmrc</fileId>
 +          <targetLocation>$HOME/.npmrc</targetLocation>
 +          <variable/>
 +        </org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +      </managedFiles>
 +    </org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper>
    </buildWrappers>
  </project>
@@@ -279,7 -279,11 +279,11 @@@ export MAVEN_OPT
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
  # shellcheck disable=SC2086
- $MVN clean javadoc:aggregate \
+ $MVN clean install javadoc:aggregate \
+     -Pq -Dmaven.javadoc.skip=false \
+     -DskipTests=true \
+     -Dcheckstyle.skip=true \
+     -Dfindbugs.skip=true \
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      $MAVEN_PARAMS $MAVEN_OPTIONS
@@@ -580,14 -584,5 +584,14 @@@ rm ~/.netr
        <user>test-credential</user>
      </com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
      <jenkins.plugins.openstack.compute.JCloudsOneOffSlave/>
 +    <org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper plugin="config-file-provider">
 +      <managedFiles>
 +        <org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +          <fileId>npmrc</fileId>
 +          <targetLocation>$HOME/.npmrc</targetLocation>
 +          <variable/>
 +        </org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +      </managedFiles>
 +    </org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper>
    </buildWrappers>
  </project>
@@@ -289,7 -289,11 +289,11 @@@ export MAVEN_OPT
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
  # shellcheck disable=SC2086
- $MVN clean javadoc:aggregate \
+ $MVN clean install javadoc:aggregate \
+     -Pq -Dmaven.javadoc.skip=false \
+     -DskipTests=true \
+     -Dcheckstyle.skip=true \
+     -Dfindbugs.skip=true \
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      $MAVEN_PARAMS $MAVEN_OPTIONS
@@@ -702,14 -706,5 +706,14 @@@ rm ~/.netr
        <user>test-credential</user>
      </com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
      <jenkins.plugins.openstack.compute.JCloudsOneOffSlave/>
 +    <org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper plugin="config-file-provider">
 +      <managedFiles>
 +        <org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +          <fileId>npmrc</fileId>
 +          <targetLocation>$HOME/.npmrc</targetLocation>
 +          <variable/>
 +        </org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +      </managedFiles>
 +    </org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper>
    </buildWrappers>
  </project>
@@@ -241,7 -241,11 +241,11 @@@ export MAVEN_OPT
  
  # Disable SC2086 because we want to allow word splitting for $MAVEN_* parameters.
  # shellcheck disable=SC2086
- $MVN clean javadoc:aggregate \
+ $MVN clean install javadoc:aggregate \
+     -Pq -Dmaven.javadoc.skip=false \
+     -DskipTests=true \
+     -Dcheckstyle.skip=true \
+     -Dfindbugs.skip=true \
      --global-settings &quot;$GLOBAL_SETTINGS_FILE&quot; \
      --settings &quot;$SETTINGS_FILE&quot; \
      $MAVEN_PARAMS $MAVEN_OPTIONS
@@@ -542,14 -546,5 +546,14 @@@ rm ~/.netr
        <user>test-credential</user>
      </com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper>
      <jenkins.plugins.openstack.compute.JCloudsOneOffSlave/>
 +    <org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper plugin="config-file-provider">
 +      <managedFiles>
 +        <org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +          <fileId>npmrc</fileId>
 +          <targetLocation>$HOME/.npmrc</targetLocation>
 +          <variable/>
 +        </org.jenkinsci.plugins.configfiles.buildwrapper.ManagedFile>
 +      </managedFiles>
 +    </org.jenkinsci.plugins.configfiles.buildwrapper.ConfigFileBuildWrapper>
    </buildWrappers>
  </project>