summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global-templates-java.yaml7
-rw-r--r--jjb/mso/mso-libs.yaml7
2 files changed, 9 insertions, 5 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 1d8b9a9b9..a239d0c23 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -122,8 +122,8 @@
- job-template:
# Job template for Java daily release jobs
#
- # The purpose of this job template is to run "maven version && maven clean deploy" for
- # projects using this template.
+ # The purpose of this job template is to run "maven version && maven clean
+ # deploy" for projects using this template.
#
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
@@ -176,7 +176,8 @@
- maven-target:
maven-version: 'mvn33'
goals: 'clean deploy'
- properties: '{maven-deploy-properties}'
+ properties:
+ - '{maven-deploy-properties}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
diff --git a/jjb/mso/mso-libs.yaml b/jjb/mso/mso-libs.yaml
index 28ed86e31..99c25d425 100644
--- a/jjb/mso/mso-libs.yaml
+++ b/jjb/mso/mso-libs.yaml
@@ -12,7 +12,10 @@
- 'master':
branch: 'master'
mvn-settings: 'mso-settings'
- maven-deploy-properties:
- - 'deployAtEnd=true'
+ # due to a strange macro / variable translation problem this needs to be
+ # passed as a string block to properly get the properties correctly defined
+ # in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
files: '**'
archive-artifacts: ''