Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Set Gerrit to 3.0.16
Download plugins from archive-ci
Set Gerrit to 2.16.26
Set Gerrit to 3.0.15
Set Gerrit to 2.16.25
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: I7135342c134a2ac9231fb3a5dbd78311f1ecdcd2
diff --git a/fpm/Makefile b/fpm/Makefile
index 217566d..15a614a 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,7 +1,7 @@
-VERSION=3.0.16
-WAR_VERSION=3.0.16
+VERSION=3.1.11
+WAR_VERSION=3.1.11
URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
-CI_URL=https://archive-ci.gerritforge.com
+CI_URL=https://gerrit-ci.gerritforge.com
RELEASE=1
NAME=gerrit
@@ -20,12 +20,12 @@
WEB_URL=https://www.gerritcodereview.com/
WAR=$(BUILD_ROOT)/bin/gerrit.war
-PLUGINS_CI=https://archive-ci.gerritforge.com/job
+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 0b78a31..94c35f3 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 3.0.16
+VERSION := 3.1.11
all: server
