commit 7f7130d64800b5ab36bb5f29b3f1d192f05710e4
author Luca Milanesio <luca.milanesio@gmail.com> Fri Jan 29 19:41:16 2021 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Fri Jan 29 19:41:16 2021 +0000
tree 8499ea4a7522fd3ae49642e55206e0450a304c8e
parent 6ced86fcb194869cbfe277b2987aa83ccf203c60
parent d9bc6286fbd9075204809882fd0dacbac5fd6754

Merge branch 'stable-3.2'

* stable-3.2:
  Set Gerrit to 3.2.7
  Set Gerrit to 3.1.12
  Set Gerrit to 3.0.16
  Download plugins from archive-ci
  Set Gerrit to 2.16.26
  Set Gerrit to 3.2.6
  Set Gerrit to 3.1.11
  Set Gerrit to 3.2.5.1
  Set Gerrit to 3.0.15
  Set Gerrit to 2.16.25
  Set Gerrit to 3.1.10
  Set Gerrit to 3.2.5
  Set Gerrit to 3.2.4
  Download uploadvalidator from its own stable-3.2 branch
  Set Gerrit to 3.1.9
  Set Gerrit to 3.0.14
  Set Gerrit to 2.16.24
  Set Gerrit to 2.16.23
  Set Gerrit to 3.0.13

Change-Id: I0ce8da8445f529af9bcf6e78ce2537f1b2a840c4

fpm/Makefile

diff --git a/fpm/Makefile b/fpm/Makefile
index f6befac..026c646 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,5 +1,5 @@
-VERSION=3.2.7
-WAR_VERSION=3.2.7
+VERSION=3.3.1
+WAR_VERSION=3.3.1
 URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
 CI_URL=https://gerrit-ci.gerritforge.com
 RELEASE=1
@@ -22,10 +22,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.2/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
+  plugin-out-of-the-box-bazel-master-stable-3.3/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
 PLUGINS_JOBS= \
-  plugin-avatars-gravatar-bazel-master-stable-3.2/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
-  plugin-uploadvalidator-bazel-stable-3.2/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+  plugin-avatars-gravatar-bazel-master-stable-3.3/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
+  plugin-uploadvalidator-bazel-stable-3.3/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

macOS/Makefile

diff --git a/macOS/Makefile b/macOS/Makefile
index 3255a29..4c427f1 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.2.7
+VERSION := 3.3.1
 
 all: server