From cda1797958962a45ddd0b0a52209f1ccb583e271 Mon Sep 17 00:00:00 2001
From: JulienBe <jb379x@att.com>
Date: Tue, 17 Oct 2017 13:46:51 +0200
Subject: Add step for version to docker java properties

Add an optional step to use maven version plugin

Issue-ID: CLAMP-57

Change-Id: I1d71183b98ae37c7e519b0e2c41c76c647b2e3f6
Signed-off-by: JulienBe <jb379x@att.com>
---
 jjb/aaf/aaf-authz-docker.yaml  |  1 +
 jjb/clamp/clamp.yaml           |  1 +
 jjb/global-templates-java.yaml | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)

(limited to 'jjb')

diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
index 332885697..754fbddd3 100644
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ b/jjb/aaf/aaf-authz-docker.yaml
@@ -18,6 +18,7 @@
           - skipDockerTag=true
           - skipDockerPush=true
       - '{project-name}-{stream}-docker-java-properties-daily':
+         setVersion: 'DontSetVersion'
          docker-pom: 'authz-service/pom.xml'
          mvn-profile: 'docker'
          maven-properties: |
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index da9bc2548..746caa0ea 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -16,6 +16,7 @@
           - skipDockerTag=true
           - skipDockerPush=true
       - '{project-name}-{stream}-docker-java-properties-daily':
+         setVersion: 'DoSetVersion'
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          maven-properties: |
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index be02418eb..e31a470df 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1458,6 +1458,22 @@
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
+      - conditional-step:
+          condition-kind: regex-match
+          regex: DoSetVersion
+          label: '{setVersion}'
+          steps:
+            - inject:
+                properties-file: version.properties
+            - maven-target:
+                maven-version: '{maven-version}'
+                goals: 'versions:set versions:update-child-modules versions:commit -B'
+                properties:
+                  - 'newVersion=${{release_version}}'
+                settings: '{mvn-settings}'
+                settings-type: cfp
+                global-settings: 'global-settings'
+                global-settings-type: cfp
       - docker-login
       - maven-docker-push-daily:
           maven-version: '{maven-version}'
-- 
cgit 1.2.3-korg