Merge branch 'stable-2.16'
* stable-2.16:
Set version to 2.16.9
Set Gerrit to 2.15.14
Plugins jars are generated under bazel-bin
Set version to 2.16.8
Get plugin-manager from its own stable-2.16 branch
Change-Id: I640bb6de4559822a89296c36a04c8a13b9e028a4
diff --git a/fpm/Makefile b/fpm/Makefile
index e3e627e..f22cf1d 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -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-genfiles/plugins/out-of-the-box/out-of-the-box.jar
+ plugin-out-of-the-box-bazel-master-stable-3.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/out-of-the-box/out-of-the-box.jar
PLUGINS_JOBS= \
- plugin-avatars-gravatar-bazel-master-stable-3.0/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/avatars-gravatar/avatars-gravatar.jar \
- plugin-uploadvalidator-bazel-master-stable-3.0/lastSuccessfulBuild/artifact/bazel-genfiles/plugins/uploadvalidator/uploadvalidator.jar
+ plugin-avatars-gravatar-bazel-master-stable-3.0/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
+ plugin-uploadvalidator-bazel-master-stable-3.0/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
