From 75da13df3ecabbfdbe631b2e8a87cf8699c907ba Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 16 Oct 2019 11:27:56 +0900 Subject: [PATCH 1/3] Set version to 2.14.21-SNAPSHOT We don't intend to release 2.14.21; this change is only so that building and deploying the API and WAR locally doesn't overwrite the officially released 2.14.20 versions. Change-Id: Ib893db7e7af6ba1a92a6d3d66fdb248463541756 --- gerrit-acceptance-framework/pom.xml | 2 +- gerrit-extension-api/pom.xml | 2 +- gerrit-plugin-api/pom.xml | 2 +- gerrit-plugin-gwtui/pom.xml | 2 +- gerrit-war/pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index b1ae2644fe..bdfbbaf8b0 100644 --- a/gerrit-acceptance-framework/pom.xml +++ b/gerrit-acceptance-framework/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 2.14.20 + 2.14.21-SNAPSHOT jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index 4d156c68ca..7de992f63e 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.14.20 + 2.14.21-SNAPSHOT jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index 630fb6c16e..3f8eb24b31 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.14.20 + 2.14.21-SNAPSHOT jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 8da9000817..025b59cba6 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.14.20 + 2.14.21-SNAPSHOT jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index b4f2ec1387..916783c777 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.14.20 + 2.14.21-SNAPSHOT war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index d323cd4069..539438ef11 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "2.14.20" +GERRIT_VERSION = "2.14.21-SNAPSHOT" From 1c04c59e80838a9c3d72bfbabdb5d64cd0ac5c55 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 16 Oct 2019 11:13:32 +0900 Subject: [PATCH 2/3] Replace references to bazel-genfiles with bazel-bin In bazel 0.25 the target directory was changed from bazel-genfiles to bazel-bin and bazel-genfiles was symlinked to bazel-bin. In bazel 1.0 the symlink no longer gets created, and this causes the ./tools/maven/api.sh script to fail on a clean workspace because it still refers to the old location: ./tools/maven/api.sh: line 66: ./bazel-genfiles/tools/maven/api_install.sh: No such file or directory Fix api.sh to use bazel-bin, and also update dev-build-plugin.txt to refer to bazel-bin. Note that some documentation was previously updated in I9521cd7e5. Bug: Issue 11757 Change-Id: I21f204d44ac78559f51ad2e62b085240170d83a7 --- Documentation/dev-build-plugins.txt | 2 +- tools/maven/api.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/dev-build-plugins.txt b/Documentation/dev-build-plugins.txt index 072c22c9dc..9bf41e2ca8 100644 --- a/Documentation/dev-build-plugins.txt +++ b/Documentation/dev-build-plugins.txt @@ -69,7 +69,7 @@ bazel build plugins/: The output can be normally found in the following directory: ---- -bazel-genfiles/plugins//.jar +bazel-bin/plugins//.jar ---- Some plugins describe their build process in `src/main/resources/Documentation/build.md` diff --git a/tools/maven/api.sh b/tools/maven/api.sh index e72e3cbaee..076ef87d2f 100755 --- a/tools/maven/api.sh +++ b/tools/maven/api.sh @@ -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 From b7879ea14acd41b3d33922101d3042bbefa616e8 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 16 Oct 2019 13:41:37 +0900 Subject: [PATCH 3/3] Remove buck related entries from .gitignore Change-Id: I88469233bc3c89809b2146fd56b73852f8ddb885 --- .gitignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index d1ddc33445..b1ad00cde3 100644 --- a/.gitignore +++ b/.gitignore @@ -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