From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 30 Apr 2019 00:31:14 +0000 (-0700)
Subject: Remove maven-versions-plugin-set-version var
X-Git-Tag: v0.37.0~1
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F52%2F15452%2F3;p=releng%2Fglobal-jjb.git

Remove maven-versions-plugin-set-version var

This is a variable that does not need to be defined by the users
of the jobs. The version needed in this builder step is inherited
from versions.properties as "release_version" and it is fixed as
that.
This also helps teams not having to define this version in 2
places and just rely on version.properties.
This upgrade only affects projects using maven-versions-plugin
to update their versions (ONAP).

Change-Id: I6393291eb555ed0b8f5220264688193c1af9fd5f
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---

diff --git a/.jjb-test/lf-maven-jobs/lf-maven-versions-plugin.yaml b/.jjb-test/lf-maven-jobs/lf-maven-versions-plugin.yaml
index 147bc9ba..3a262a3f 100644
--- a/.jjb-test/lf-maven-jobs/lf-maven-versions-plugin.yaml
+++ b/.jjb-test/lf-maven-jobs/lf-maven-versions-plugin.yaml
@@ -4,7 +4,6 @@
     jobs:
       - gerrit-maven-stage:
           maven-versions-plugin: true
-          maven-versions-plugin-set-version: 2.0.0
           mvn-pom: location/pom.xml
 
     project-name: gerrit-maven-versions-plugin
diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst
index 575117e6..306ef8e4 100644
--- a/docs/jjb/lf-maven-jobs.rst
+++ b/docs/jjb/lf-maven-jobs.rst
@@ -71,7 +71,6 @@ Conditionally calls Maven versions plugin to set, update and commit the maven `v
     :maven-versions-plugin: Whether to call Maven versions plugin or not. (default: false)
     :mvn-version: Version of Maven to execute Sonar with.
     :mvn-pom: Location of pom.xml.
-    :maven-versions-plugin-set-version: Version number to upgrade to.
     :mvn-settings: Maven settings.xml file containing credentials to use.
 
 lf-maven-stage
@@ -346,7 +345,6 @@ directory is then used later to deploy to Nexus.
     :mvn-opts: Sets MAVEN_OPTS. (default: '')
     :mvn-params: Additional mvn parameters to pass to the cli. (default: '')
     :mvn-version: Version of maven to use. (default: mvn35)
-    :maven-versions-plugin-set-version: New version to use in Maven versions plugin. (default: '')
     :ossrh-profile-id: Profile ID for project as provided by OSSRH.
         (default: '')
     :sign-artifacts: Sign artifacts with Sigul. (default: false)
diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 4342a8f6..b58eaff8 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -35,7 +35,7 @@
                 pom: '{mvn-pom}'
                 goals: 'versions:set versions:update-child-modules versions:commit -B'
                 properties:
-                  - 'newVersion=${{maven-versions-plugin-set-version}}'
+                  - 'newVersion=${{release_version}}'
                 settings: '{mvn-settings}'
                 settings-type: cfp
                 global-settings: 'global-settings'
@@ -692,7 +692,6 @@
     github-url: 'https://github.com'
     java-version: openjdk8
     maven-versions-plugin: false
-    maven-versions-plugin-set-version: ''
     mvn-central: false
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -754,7 +753,6 @@
           maven-versions-plugin: '{maven-versions-plugin}'
           mvn-version: '{mvn-version}'
           mvn-pom: '{mvn-pom}'
-          maven-versions-plugin-set-version: '{maven-versions-plugin-set-version}'
           mvn-settings: '{mvn-settings}'
       - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - lf-maven-build:
diff --git a/releasenotes/notes/maven-versions-plugin-set-version-var-ddcdecc8ca0c7f4b.yaml b/releasenotes/notes/maven-versions-plugin-set-version-var-ddcdecc8ca0c7f4b.yaml
new file mode 100644
index 00000000..1fdf5317
--- /dev/null
+++ b/releasenotes/notes/maven-versions-plugin-set-version-var-ddcdecc8ca0c7f4b.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    This is a variable that does not need to be defined by the users
+    of the jobs. The version needed in this builder step is inherited
+    from versions.properties as "release_version" and it is fixed as
+    that.
+    This also helps teams not having to define this version in 2
+    places and just rely on version.properties.