summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/global-templates-java.yaml12
-rw-r--r--jjb/policy/policy-docker.yaml2
2 files changed, 8 insertions, 6 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 83dafaf7c..a84a7d08c 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -635,10 +635,12 @@
- docker-login
- - maven-docker-push-daily:
- mvn-settings: '{mvn-settings}'
- pom: '{docker-pom}'
- # use default as mvn-profile if profile is not needed
- mvn-profile: '{mvn-profile}'
+ - maven-target:
+ maven-version: 'mvn33'
+ goals: '{mvn-goals}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
- shell: '{script}'
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index e7e5f9f24..71879f16c 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -5,7 +5,7 @@
jobs:
- '{project-name}-{stream}-docker-java-shell-daily':
docker-pom: 'pom.xml'
- mvn-profile: 'prepare-package'
+ mvn-goals: 'prepare-package'
script:
!include-raw-escape: 'include-raw-docker.sh'