Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Set Gerrit to 3.0.11
Fetch avatar-gravatar plugin from its own stable-3.0 branch
Change-Id: I855709d2c17d2c65a1db7d7747aa89e5ecf3bbbe
diff --git a/fpm/Makefile b/fpm/Makefile
index d6c2def..d2f3ac0 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,5 +1,5 @@
-VERSION=3.0.11
-WAR_VERSION=3.0.11
+VERSION=3.1.6
+WAR_VERSION=3.1.6
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.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
+ plugin-out-of-the-box-bazel-master-stable-3.1/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
PLUGINS_JOBS= \
- plugin-avatars-gravatar-bazel-stable-3.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
- plugin-uploadvalidator-bazel-stable-3.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/uploadvalidator/uploadvalidator.jar
+ plugin-avatars-gravatar-bazel-master-stable-3.1/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
+ plugin-uploadvalidator-bazel-stable-3.1/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 989364f..af0bfd7 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.0.11
+VERSION := 3.1.6
all: server
