Merge "Split maven-deploy into a macro"

diff --combined jjb/lf-maven-jobs.yaml
index 26451a4,d290115..7e55dbe
--- 1/jjb/lf-maven-jobs.yaml
--- 2/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@@ -48,6 -48,17 +48,17 @@@
        - github-maven-javadoc-publish
        - github-maven-javadoc-verify
  
+ ##########
+ # Macros #
+ ##########
+ 
+ - builder:
+     name: lf-maven-deploy
+     builders:
+       - shell: !include-raw:
+           - ../shell/common-variables.sh
+           - ../shell/maven-deploy.sh
+ 
  ####################
  # COMMON FUNCTIONS #
  ####################
@@@ -120,7 -131,7 +131,7 @@@
  
      branch: master
      build-days-to-keep: 30  # 30 days for troubleshooting purposes
 -    build-timeout: 30
 +    build-timeout: 60
      git-url: '$GIT_URL/$PROJECT'
      java-version: openjdk8
      mvn-global-settings: global-settings
@@@ -233,7 -244,7 +244,7 @@@
  
      branch: master
      build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
 -    build-timeout: 30
 +    build-timeout: 60
      git-url: '$GIT_URL/$PROJECT'
      java-version: openjdk8
      mvn-global-settings: global-settings
@@@ -346,7 -357,7 +357,7 @@@
  
      branch: master
      build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
 -    build-timeout: 30
 +    build-timeout: 60
      git-url: '$GIT_URL/$PROJECT'
      java-version: openjdk8
      mvn-global-settings: global-settings
@@@ -456,7 -467,7 +467,7 @@@
  
      branch: master
      build-days-to-keep: 30  # 30 days in case we need to troubleshoot
 -    build-timeout: 30
 +    build-timeout: 60
      cron: ''
      git-url: '$GIT_URL/$PROJECT'
      java-version: openjdk8
@@@ -502,7 -513,7 +513,7 @@@
            - ../shell/common-variables.sh
            - ../shell/maven-fetch-metadata.sh
            - ../shell/maven-build.sh
-           - ../shell/maven-deploy.sh
+       - lf-maven-deploy
        - lf-provide-maven-settings-cleanup
  
      publishers:
@@@ -586,7 -597,7 +597,7 @@@
  
      branch: master
      build-days-to-keep: 30  # 30 days in case a release takes long to get approved.
 -    build-timeout: 30
 +    build-timeout: 60
      cron: ''
      git-url: '$GIT_URL/$PROJECT'
      java-version: openjdk8
@@@ -697,7 -708,7 +708,7 @@@
  
      branch: master  # Sonar should always be run on master branch
      build-days-to-keep: 7
 -    build-timeout: 30
 +    build-timeout: 60
      git-url: '$GIT_URL/$PROJECT'
      java-version: openjdk8
      mvn-global-settings: global-settings