Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Set Gerrit to 2.14.20
Set Gerrit to 2.15.13
Set version to 2.13.14 and require Java 8
Set version to 2.13.13
Set Gerrit to 2.15.12
Set Gerrit to 2.14.19
Set Gerrit to 2.15.11
Set Gerrit to 2.15.10
Set Gerrit to 2.15.9
Release Gerrit version 2.13.12
Release Gerrit version 2.14.18
Release Gerrit version 2.15.8
Set Gerrit to 2.15.7
Set Gerrit to 2.14.17
Get plugin-manager and uploadvalidator from 2.15 branch
Set Gerrit to 2.15.6
Set Gerrit to 2.14.16
Set Gerrit to 2.15.5
Set Gerrit to 2.14.15
Upgrade Gerrit to 2.15.4
Set Gerrit to 2.14.14
Set Gerrit to 2.14.13
Set Gerrit to 2.14.12
Set Gerrit to 2.14.11
Upgrade to Gerrit version 2.15.3
Set Gerrit to 2.14.10
Set Gerrit to 2.14.9
Set Gerrit to 2.14.8
Set Gerrit to v2.14.7
Bump to Gerrit v2.13.11 for macOS intaller
Bump to Gerrit version 2.13.11
Get Ubuntu 15.04 packages from old-releases
Bump to Gerrit Ver. 2.13.10
Set Gerrit to v2.14.6
Set Gerrit to v2.14.5.1
Bump to Gerrit Ver. 2.13.9
Change-Id: Ib8c792ac9e0ebb0b65313dc8719b71066424f398
diff --git a/deb-repo/Makefile b/deb-repo/Makefile
index 34e50ff..ffc932e 100644
--- a/deb-repo/Makefile
+++ b/deb-repo/Makefile
@@ -9,7 +9,7 @@
MIRROR_URL=http://mirrorlist.$(VENDOR_LC).com/deb
# Vendor PGP Key ID (default GerritForge)
-PGP_KEY_ID=1871F775
+PGP_KEY_ID=9911F82E27836B7FAE85090D847005AE619067D5
### END OF VARIABLES THAT CAN BE OVERRIDDEN ###
define DEB_RELEASE
@@ -48,7 +48,7 @@
cd server && apt-ftparchive packages dists/gerrit/contrib/binary-i386 > dists/gerrit/contrib/binary-i386/Packages
cd server && apt-ftparchive packages dists/gerrit/contrib/binary-amd64 > dists/gerrit/contrib/binary-amd64/Packages
cd server && apt-ftparchive release dists/gerrit >> Release
- gpg -abs -o server/Release.gpg server/Release
+ gpg -abs --default-key $(PGP_KEY_ID) -o server/Release.gpg server/Release
mv server/Release* server/dists/gerrit/.
.PHONY: clean prepare server
diff --git a/docker/centos7/Makefile b/docker/centos7/Makefile
index 0b5edc7..599b330 100644
--- a/docker/centos7/Makefile
+++ b/docker/centos7/Makefile
@@ -1,10 +1,10 @@
# Customise the following variable as Make parameters
# to produce a yum.repo for a VENDOR distribution
# Default values are pointing to GerritForge (www.gerritforge.com)
-VERSION=2.15.13
+VERSION=2.16.7
RELEASE=1
REPO_VERSION=1
-REPO_RELEASE=2
+REPO_RELEASE=1
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
IMAGE=$(VENDOR_LC)/gerrit-centos7
@@ -13,7 +13,7 @@
# End of the variables that can be customized
define DOCKERFILE
-FROM centos:7.4.1708
+FROM centos:7.5.1804
MAINTAINER $(VENDOR)
# Allow remote connectivity and sudo
diff --git a/docker/ubuntu16.04/Makefile b/docker/ubuntu16.04/Makefile
index beb82a2..436ff33 100644
--- a/docker/ubuntu16.04/Makefile
+++ b/docker/ubuntu16.04/Makefile
@@ -1,7 +1,7 @@
# Customise the following variable as Make parameters
# to produce a yum.repo for a VENDOR distribution
# Default values are pointing to GerritForge (www.gerritforge.com)
-VERSION=2.15.13
+VERSION=2.16.7
RELEASE=1
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
diff --git a/fpm/Makefile b/fpm/Makefile
index f9577e6..4749917 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,5 +1,6 @@
-VERSION=2.15.13
-URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(VERSION).war
+VERSION=2.16.7
+WAR_VERSION=2.16.7
+URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(WAR_VERSION).war
CI_URL=https://gerrit-ci.gerritforge.com
RELEASE=1
@@ -21,13 +22,13 @@
WAR=$(BUILD_ROOT)/bin/gerrit.war
PLUGINS_CI=https://gerrit-ci.gerritforge.com/job
LIBS_JOBS= \
- plugin-out-of-the-box-bazel-master-stable-2.15/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/out-of-the-box/out-of-the-box.jar
+ plugin-out-of-the-box-bazel-master-stable-2.16/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/out-of-the-box/out-of-the-box.jar
PLUGINS_JOBS= \
- plugin-plugin-manager-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/plugin-manager/plugin-manager.jar \
- plugin-avatars-gravatar-bazel-master-stable-2.15/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/avatars-gravatar/avatars-gravatar.jar \
- plugin-gitiles-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/gitiles/gitiles.jar \
- plugin-delete-project-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/delete-project/delete-project.jar \
- plugin-uploadvalidator-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/uploadvalidator/uploadvalidator.jar
+ plugin-plugin-manager-bazel-master-stable-2.16/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/plugin-manager/plugin-manager.jar \
+ plugin-avatars-gravatar-bazel-master-stable-2.16/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/avatars-gravatar/avatars-gravatar.jar \
+ plugin-gitiles-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/gitiles/gitiles.jar \
+ plugin-delete-project-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/delete-project/delete-project.jar \
+ plugin-uploadvalidator-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/uploadvalidator/uploadvalidator.jar
RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb
@@ -92,12 +93,12 @@
plugins:
for job in $(PLUGINS_JOBS); \
- do echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do set -e && echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
done
libs:
for job in $(LIBS_JOBS); \
- do echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/lib/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do set -e && echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/lib/`basename $$job` $(PLUGINS_CI)/$$job; \
done
$(SCRIPTS_ROOT)/%.sh: scripts/%.sh
diff --git a/macOS/Makefile b/macOS/Makefile
index df6bf08..c00f046 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 2.15.13
+VERSION := 2.16.7
all: server
