Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Plugins jars are generated under bazel-bin
Change-Id: Ifc051aceb61b05c78393323877a7308b1af1f22e
diff --git a/fpm/Makefile b/fpm/Makefile
index f9577e6..0705607 100644
--- a/fpm/Makefile
+++ b/fpm/Makefile
@@ -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.15/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-bin/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-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/plugin-manager/plugin-manager.jar \
+ plugin-avatars-gravatar-bazel-master-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/avatars-gravatar/avatars-gravatar.jar \
+ plugin-gitiles-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/gitiles/gitiles.jar \
+ plugin-delete-project-bazel-stable-2.15/lastSuccessfulBuild/artifact/bazel-bin/plugins/delete-project/delete-project.jar \
+ plugin-uploadvalidator-bazel-stable-2.15/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
