Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Set Gerrit to 2.14.20
Set version to 2.13.14 and require Java 8
Set version to 2.13.13
Set Gerrit to 2.14.19
Release Gerrit version 2.13.12
Release Gerrit version 2.14.18
Set Gerrit to 2.14.17
Set Gerrit to 2.14.16
Set Gerrit to 2.14.15
Set Gerrit to 2.14.14
Set Gerrit to 2.14.13
Set Gerrit to 2.14.12
Set Gerrit to 2.14.11
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: Ia26f488dbd3293d408da4fe0dc520264fe157ffe
diff --git a/docker/centos7/Makefile b/docker/centos7/Makefile
index 2ecbbc1..0b5edc7 100644
--- a/docker/centos7/Makefile
+++ b/docker/centos7/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.14.20
+VERSION=2.15.13
RELEASE=1
REPO_VERSION=1
REPO_RELEASE=2
@@ -13,7 +13,7 @@
# End of the variables that can be customized
define DOCKERFILE
-FROM centos:7.3.1611
+FROM centos:7.4.1708
MAINTAINER $(VENDOR)
# Allow remote connectivity and sudo
diff --git a/docker/ubuntu16.04/Makefile b/docker/ubuntu16.04/Makefile
index c0b3a53..beb82a2 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.14.20
+VERSION=2.15.13
RELEASE=1
VENDOR=GerritForge
VENDOR_LC=$(shell echo $(VENDOR) | tr A-Z a-z)
diff --git a/fpm/Makefile b/fpm/Makefile
index a38c6b1..f9577e6 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -1,4 +1,4 @@
-VERSION=2.14.20
+VERSION=2.15.13
URL=https://gerrit-releases.storage.googleapis.com/gerrit-$(VERSION).war
CI_URL=https://gerrit-ci.gerritforge.com
RELEASE=1
@@ -21,13 +21,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.14/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/out-of-the-box/out-of-the-box.jar
+ plugin-out-of-the-box-bazel-master-stable-2.15/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/out-of-the-box/out-of-the-box.jar
PLUGINS_JOBS= \
- plugin-plugin-manager-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/plugin-manager/plugin-manager.jar \
- plugin-avatars-gravatar-bazel-master-stable-2.14/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/avatars-gravatar/avatars-gravatar.jar \
- plugin-gitiles-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/gitiles/gitiles.jar \
- plugin-delete-project-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/delete-project/delete-project.jar \
- plugin-uploadvalidator-bazel-stable-2.14/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/uploadvalidator/uploadvalidator.jar
+ 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
RPM_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm
DEB_OUT=$(OUT)/gerrit-$(VERSION)-$(RELEASE).$(BUILD_ARCH).deb
@@ -88,16 +88,16 @@
rm -Rf $(SCRIPTS_ROOT)
$(WAR): $(basedir $(WAR))
- curl -o $@ $(URL)
+ curl -f -o $@ $(URL)
plugins:
for job in $(PLUGINS_JOBS); \
- do curl -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do echo ">> Download: $$job" && curl -f -o $(BUILD_ROOT)/plugins/`basename $$job` $(PLUGINS_CI)/$$job; \
done
libs:
for job in $(LIBS_JOBS); \
- do curl -o $(BUILD_ROOT)/lib/`basename $$job` $(PLUGINS_CI)/$$job; \
+ do 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 59210e4..df6bf08 100644
--- a/macOS/Makefile
+++ b/macOS/Makefile
@@ -1,4 +1,4 @@
-VERSION := 2.14.20
+VERSION := 2.15.13
all: server
