Merge "Handle unbound arrays correctly"

diff --git a/jjb/lf-info-vote.yaml b/jjb/lf-info-vote.yaml
index 57dc63b..24c7c11 100644 (file)
--- a/jjb/lf-info-vote.yaml
+++ b/jjb/lf-info-vote.yaml
@@ -94,7 +94,7 @@
           server-name: '{gerrit-server-name}'
           trigger-on: '{obj:gerrit_verify_triggers}'
           projects:
-            - project-compare-type: 'REG_EXP'
+            - project-compare-type: 'ANT'
               project-pattern: '**'
               branches:
                 - branch-compare-type: 'ANT'

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 7c47aec..aa6904b 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -992,12 +992,12 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - lf-maven-versions-plugin:
           maven-versions-plugin: '{maven-versions-plugin}'
           mvn-version: '{mvn-version}'
           mvn-pom: '{mvn-pom}'
           mvn-settings: '{mvn-settings}'
+      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - inject:
           properties-content: |
               CONTAINER_PULL_REGISTRY={container-public-registry}

diff --git a/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml b/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml
new file mode 100644 (file)
index 0000000..d00cb25
--- /dev/null
+++ b/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    lf-maven-versions-plugin builder step needs to run before maven-patch-release.sh
+    as this second script contains a condition to confirm if the maven vesions
+    plugin was selected as a way to remove the 'SNAPSHOT' pattern from the pom.xml
+    files.
+    lf-maven-docker-stage was based on lf-maven-stage and it seems that these particular
+    builder steps were switched in place accidentally.