Pass mvn properties as string
Change-Id: I52651acba643bd78f66592e63bce913c87103a18
Signed-off-by: JulienBe <jb379x@att.com>
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 1004a2c..d5b04fe 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -6,12 +6,14 @@
jobs:
- '{project-name}-{stream}-verify-java-checkstyle'
- '{project-name}-{stream}-merge-properties-java':
- maven-properties: |
- docker.pull.registry=nexus3.onap.org:10001
- docker.push.registry=nexus3.onap.org:10003
+ mvn_properties:
+ - docker.pull.registry=nexus3.onap.org:10001
+ - docker.push.registry=nexus3.onap.org:10003
- '{project-name}-{stream}-release-java-daily-checkstyle':
- maven-deploy-properties: |
- skipDockerBuild
+ mvn_properties:
+ - skipDockerBuild=true
+ - skipDockerTag=true
+ - skipDockerPush=true
- '{project-name}-{stream}-docker-java-properties-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c5803dc..3146d6e 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -479,8 +479,7 @@
maven-version: '{maven-version}'
goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
- properties:
- - '{maven-deploy-properties}'
+ properties: '{obj:mvn_properties}'
settings: '{mvn-settings}'
settings-type: cfp
global-settings: 'global-settings'
@@ -826,7 +825,7 @@
settings-type: cfp
global-settings: 'global-settings'
global-settings-type: cfp
- properties: '{maven-properties}'
+ properties: '{obj:mvn_properties}'
publishers:
- infra-shiplogs: