Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove buck related entries from .gitignore
  Replace references to bazel-genfiles with bazel-bin
  Set version to 2.14.21-SNAPSHOT

Change-Id: I078eb9cfedfd1465437ab97af908061e950e35c8
This commit is contained in:
David Pursehouse 2019-10-16 13:42:58 +09:00
commit 6fc1ebe494
3 changed files with 2 additions and 4 deletions

2
.gitignore vendored
View File

@ -11,7 +11,6 @@
/.apt_generated
/.apt_generated_tests
/.bazel_path
/.buckd
/.classpath
/.factorypath
/.idea
@ -22,7 +21,6 @@
/.settings/org.maven.ide.eclipse.prefs
/bazel-*
/bin/
/buck-out
/eclipse-out
/extras
/gerrit-package-plugins

View File

@ -69,7 +69,7 @@ bazel build plugins/<plugin-name>:<plugin-name>
The output can be normally found in the following directory:
----
bazel-genfiles/plugins/<plugin-name>/<plugin-name>.jar
bazel-bin/plugins/<plugin-name>/<plugin-name>.jar
----
Some plugins describe their build process in `src/main/resources/Documentation/build.md`

View File

@ -63,4 +63,4 @@ fi
bazel build //tools/maven:gen_${command} "$@" || \
{ echo "bazel failed to build gen_${command}. Use VERBOSE=1 for more info" ; exit 1 ; }
./bazel-genfiles/tools/maven/${command}.sh
./bazel-bin/tools/maven/${command}.sh