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
diff --git a/fpm/Makefile b/fpm/Makefile
index 64481a4..aed41ac 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,5 +1,6 @@
-VERSION=3.4.5
-WAR_VERSION=3.4.5
+VERSION=3.5.1
+WAR_VERSION=3.5.1
+BRANCH=stable-3.5
URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
CI_URL=https://gerrit-ci.gerritforge.com
RELEASE=1
@@ -22,10 +23,10 @@
WAR=$(BUILD_ROOT)/bin/gerrit.war
PLUGINS_CI=https://gerrit-ci.gerritforge.com/job
LIBS_JOBS= \
- plugin-out-of-the-box-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
+ 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-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
- plugin-uploadvalidator-bazel-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+ plugin-avatars-gravatar-bazel-master-$(BRANCH)/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.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
diff --git a/macOS/Makefile b/macOS/Makefile
index 51cc999..043a09e 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.4.5
+VERSION := 3.5.1
all: server
