commit e5c60362fae0e8abc8f248eefde8a6f89e09dc1c
author Luca Milanesio <luca.milanesio@gmail.com> Mon May 23 22:10:07 2022 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> Mon May 23 21:15:41 2022 +0000
tree edb52a6f9a9aa3429077b6cef48b3995839d3018
parent b57110a9846e85e3dc1608036d07b0315918985c
parent f8f206400b9db5a1c632635a4ae1f046f23020ae

Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Set Gerrit to 3.4.5

Also update uploadvalidator URL to download the release
from stable-3.5 as part of the merge from stable-3.4.

Change-Id: I9b1f7925778bc3840dced72cdd1a2436a57ba7d8

fpm/Makefile

diff --git a/fpm/Makefile b/fpm/Makefile
index 962087e..aed41ac 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -26,7 +26,7 @@
   plugin-out-of-the-box-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
 PLUGINS_JOBS= \
   plugin-avatars-gravatar-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
-  plugin-uploadvalidator-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+  plugin-uploadvalidator-bazel-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
 
 RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
 DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb