From 0244138ffb5a50282768bfcd9afa6dff4815d99c Mon Sep 17 00:00:00 2001 From: Alexander Martinz Date: Sun, 16 Sep 2018 18:01:43 +0000 Subject: [PATCH 01/19] Fix GitLab and Bitbucket services Since commit I37bd47ac0c there is a precondition check to ensure that raw is not null and passing in null will result in a server error. Instead of passing in null, pass in the raw response. Change-Id: I537d017575948a4c262d55a736810f08f607e135 Signed-off-by: Alexander Martinz --- .../gerrit/plugins/oauth/BitbucketOAuthService.java | 2 +- .../googlesource/gerrit/plugins/oauth/GitLabOAuthService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java index e600067..55680f2 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java +++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/BitbucketOAuthService.java @@ -110,7 +110,7 @@ public OAuthUserInfo getUserInfo(OAuthToken token) throws IOException { public OAuthToken getAccessToken(OAuthVerifier rv) { Verifier vi = new Verifier(rv.getValue()); Token to = service.getAccessToken(null, vi); - return new OAuthToken(to.getToken(), to.getSecret(), null); + return new OAuthToken(to.getToken(), to.getSecret(), to.getRawResponse()); } @Override diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java index 2d6870a..792342e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java +++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/GitLabOAuthService.java @@ -106,7 +106,7 @@ public OAuthUserInfo getUserInfo(OAuthToken token) throws IOException { public OAuthToken getAccessToken(OAuthVerifier rv) { Verifier vi = new Verifier(rv.getValue()); Token to = service.getAccessToken(null, vi); - return new OAuthToken(to.getToken(), to.getSecret(), null); + return new OAuthToken(to.getToken(), to.getSecret(), to.getRawResponse()); } @Override From 153fda8ca5aeadf22920e6d81e5812d98c16f235 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 21 Sep 2018 13:53:40 +0900 Subject: [PATCH 02/19] Update bazlets to latest stable-2.14 to build with 2.14.13 API Change-Id: I03035395965cb1938774f05c0a339babce266630 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 189e820..2e20f68 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "5e0b58a466804eca41dd99df75bdf8575de0d167", + commit = "ca8f37d6b771c55d4c03e463f9f73aa8e216b11b", # local_path = "/home//projects/bazlets", ) From 3f0dfee03d8f2ab44f7bc330e5220a51269cf89e Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 28 Sep 2018 08:15:28 +0900 Subject: [PATCH 03/19] Update bazlets to latest stable-2.14 to build with 2.14.14 API Change-Id: If32cd45420ea5a8a5f3a6cecbf6bdcfbbc60a163 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 2e20f68..fcaf719 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "ca8f37d6b771c55d4c03e463f9f73aa8e216b11b", + commit = "8faa61d19d53cc125ac7fd51eb213a496ab14f8d", # local_path = "/home//projects/bazlets", ) From 49669ade54bc5e330ff93abe370ecde57c99927b Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 1 Oct 2018 13:57:47 +0900 Subject: [PATCH 04/19] Update bazlets to stable-2.15 to build with 2.15.4 API Change-Id: I6bff3a05f5579160ee72d21a000336a624c113f0 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index fcaf719..c18df04 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "8faa61d19d53cc125ac7fd51eb213a496ab14f8d", + commit = "88570121c377a8a94c76915566114bf02113a7d9", # local_path = "/home//projects/bazlets", ) From 1e55794479ded106adc8f566105c090bc1e1288d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 11 Oct 2018 10:31:13 +0900 Subject: [PATCH 05/19] Upgrade bazlets to latest stable-2.14 to build with 2.14.15 API Change-Id: I57459428b747cad47ae3fd63d038929b4c37abf0 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index fcaf719..fb651ef 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "8faa61d19d53cc125ac7fd51eb213a496ab14f8d", + commit = "0cdf281f110834b71ae134afe0a7e3fe346f0078", # local_path = "/home//projects/bazlets", ) From 770c84d18133dbc5b6787226b7930975db8bdaf2 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 12 Oct 2018 07:54:17 +0900 Subject: [PATCH 06/19] bazlets: Replace native.git_repository with skylark rule The native.git_repository rule does not work properly when invoked in a `git submodule foreach` command. Bazel will deprecate the native rules anyway, so replace with skylark's git_repository. See [1] for context. [1] https://github.com/bazelbuild/bazel/issues/6358#issuecomment-429103745 Change-Id: I3591e1e38a3d9333f4fb50224555ee49b488f788 --- bazlets.bzl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bazlets.bzl b/bazlets.bzl index de1b5d2..f089af4 100644 --- a/bazlets.bzl +++ b/bazlets.bzl @@ -1,10 +1,12 @@ +load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") + NAME = "com_googlesource_gerrit_bazlets" def load_bazlets( - commit = None, + commit, local_path = None): if not local_path: - native.git_repository( + git_repository( name = NAME, remote = "https://gerrit.googlesource.com/bazlets", commit = commit, From c266a4b6d982f43f2715bb3284ac1f0e3f083654 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 6 Sep 2018 15:58:42 +0900 Subject: [PATCH 07/19] Update README - Remove references to buck build which is no longer supported - Change the clone URL from github to googlesource - Remove --recursive from clone command; there are no submodules Change-Id: I13e941785825d753533a090342fe276cf2435709 --- README.md | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index ebc8d43..adafb42 100644 --- a/README.md +++ b/README.md @@ -27,29 +27,20 @@ Prebuilt binary artifacts are available on [release page](https://github.com/dav Build ----- -The plugin can be bulit with Buck and Bazel. To build the plugin with Buck, -install [Buck](http://facebook.github.io/buck/setup/install.html) and run -the following: - -``` - git clone --recursive https://github.com/davido/gerrit-oauth-provider.git - cd gerrit-oauth-provider && buck build plugin -``` - To build the plugin with Bazel, install [Bazel](https://bazel.build/versions/master/docs/install.html) and run the following: ``` - bazel build oauth + git clone https://gerrit.googlesource.com/plugins/oauth + cd oauth && bazel build oauth ``` Install ------- -Copy the `buck-out/gen/gerrit-oauth-provider.jar` wenn built with Buck or -`bazel-genfiles/gerrit-oauth-provider.jar` wenn built with Bazel to -`$gerit_site/plugins` and re-run init to configure it: +Copy the `bazel-genfiles/gerrit-oauth-provider.jar` to +`$gerrit_site/plugins` and re-run init to configure it: ``` java -jar gerrit.war init -d From 10c0c22532c4bccf6a42d98fac3b9b044fbc20dd Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 22 Oct 2018 08:38:07 +0900 Subject: [PATCH 08/19] README: Fix name of jar file in standalone build Change-Id: I03d5858923afb59b7b0896f7e0bd16e79d069de3 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index adafb42..9056d47 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ following: Install ------- -Copy the `bazel-genfiles/gerrit-oauth-provider.jar` to +Copy the `bazel-genfiles/oauth.jar` to `$gerrit_site/plugins` and re-run init to configure it: ``` From 5723bd7c9eff2d69d2c16ad55999ec50dcd6bfce Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 22 Oct 2018 08:47:51 +0900 Subject: [PATCH 09/19] Fix Eclipse project generation Replace the python script with shell wrapper around bazlets script. Fix the Eclipse build rules to properly include test dependencies. Change-Id: I8790bfe6b7855d28ed629d87c2127ec14433d984 --- .gitignore | 2 +- BUILD | 12 ++- tools/bzl/plugin.bzl | 1 + tools/eclipse/BUILD | 13 +-- tools/eclipse/project.py | 179 --------------------------------------- tools/eclipse/project.sh | 15 ++++ 6 files changed, 32 insertions(+), 190 deletions(-) delete mode 100755 tools/eclipse/project.py create mode 100755 tools/eclipse/project.sh diff --git a/.gitignore b/.gitignore index 898d584..fe0be47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ /.classpath -/.primary_build_tool /.project /.settings/org.maven.ide.eclipse.prefs /.settings/org.eclipse.m2e.core.prefs @@ -8,4 +7,5 @@ /bazel-oauth /bazel-out /bazel-testlogs +/eclipse-out /.idea diff --git a/BUILD b/BUILD index 7ecd628..ea1fc3a 100644 --- a/BUILD +++ b/BUILD @@ -2,6 +2,7 @@ load("//tools/bzl:junit.bzl", "junit_tests") load( "//tools/bzl:plugin.bzl", "PLUGIN_DEPS", + "PLUGIN_TEST_DEPS", "gerrit_plugin", ) @@ -27,7 +28,16 @@ junit_tests( name = "oauth_tests", srcs = glob(["src/test/java/**/*.java"]), tags = ["oauth"], - deps = PLUGIN_DEPS + [ + deps = [ + ":oauth__plugin_test_deps", + ], +) + +java_library( + name = "oauth__plugin_test_deps", + testonly = 1, + visibility = ["//visibility:public"], + exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [ ":oauth__plugin", "@scribe//jar", ], diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl index c157125..0b25d23 100644 --- a/tools/bzl/plugin.bzl +++ b/tools/bzl/plugin.bzl @@ -1,5 +1,6 @@ load( "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl", "PLUGIN_DEPS", + "PLUGIN_TEST_DEPS", "gerrit_plugin", ) diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD index 261c411..f744058 100644 --- a/tools/eclipse/BUILD +++ b/tools/eclipse/BUILD @@ -1,14 +1,9 @@ -load("//tools/bzl:plugin.bzl", "PLUGIN_DEPS", "gerrit_plugin") load("//tools/bzl:classpath.bzl", "classpath_collector") -java_library( - name = "classpath", - runtime_deps = PLUGIN_DEPS + [ - "//:oauth__plugin", - ], -) - classpath_collector( name = "main_classpath_collect", - deps = PLUGIN_DEPS + ["//:oauth__plugin"], + testonly = 1, + deps = [ + "//:oauth__plugin_test_deps", + ], ) diff --git a/tools/eclipse/project.py b/tools/eclipse/project.py deleted file mode 100755 index a98c35a..0000000 --- a/tools/eclipse/project.py +++ /dev/null @@ -1,179 +0,0 @@ -#!/usr/bin/env python -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -from __future__ import print_function -# TODO(davido): use Google style for importing instead: -# import optparse -# ... -# optparse.OptionParser -from optparse import OptionParser -from os import environ, path, makedirs -from subprocess import CalledProcessError, check_call, check_output -from xml.dom import minidom -import re -import sys - -MAIN = '//tools/eclipse:classpath' -JRE = '/'.join([ - 'org.eclipse.jdt.launching.JRE_CONTAINER', - 'org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType', - 'JavaSE-1.8', -]) -# Map of targets to corresponding classpath collector rules -cp_targets = { - MAIN: '//tools/eclipse:main_classpath_collect', -} - -ROOT = path.abspath(__file__) -while not path.exists(path.join(ROOT, 'WORKSPACE')): - ROOT = path.dirname(ROOT) - -opts = OptionParser() -opts.add_option('--name', help='name of the generated project', - action='store', default='gerrit-oauth-provider', dest='project_name') -args, _ = opts.parse_args() - -def retrieve_ext_location(): - return check_output(['bazel', 'info', 'output_base']).strip() - -def gen_primary_build_tool(): - bazel = check_output(['which', 'bazel']).strip() - with open(path.join(ROOT, ".primary_build_tool"), 'w') as fd: - fd.write("bazel=%s\n" % bazel) - fd.write("PATH=%s\n" % environ["PATH"]) - -def _query_classpath(target): - deps = [] - t = cp_targets[target] - try: - check_call(['bazel', 'build', t]) - except CalledProcessError: - exit(1) - name = 'bazel-bin/tools/eclipse/' + t.split(':')[1] + '.runtime_classpath' - deps = [line.rstrip('\n') for line in open(name)] - return deps - -def gen_project(name='gerrit', root=ROOT): - p = path.join(root, '.project') - with open(p, 'w') as fd: - print("""\ - - - %(name)s - - - org.eclipse.jdt.core.javabuilder - - - - org.eclipse.jdt.core.javanature - -\ - """ % {"name": name}, file=fd) - -def gen_classpath(ext): - def make_classpath(): - impl = minidom.getDOMImplementation() - return impl.createDocument(None, 'classpath', None) - - def classpathentry(kind, path, src=None, out=None, exported=None): - e = doc.createElement('classpathentry') - e.setAttribute('kind', kind) - # TODO(davido): Remove this and other exclude BUILD files hack - # when this Bazel bug is fixed: - # https://github.com/bazelbuild/bazel/issues/1083 - if kind == 'src': - e.setAttribute('excluding', '**/BUILD') - e.setAttribute('path', path) - if src: - e.setAttribute('sourcepath', src) - if out: - e.setAttribute('output', out) - if exported: - e.setAttribute('exported', 'true') - doc.documentElement.appendChild(e) - - doc = make_classpath() - src = set() - lib = set() - - # Classpath entries are absolute for cross-cell support - java_library = re.compile('bazel-out/local-fastbuild/bin/lib[^/]+[.]jar$') - srcs = re.compile('(.*/external/[^/]+)/jar/(.*)[.]jar') - for p in _query_classpath(MAIN): - m = java_library.match(p) - if m: - src.add(".") - else: - if p.startswith("external"): - p = path.join(ext, p) - lib.add(p) - - for s in sorted(src): - out = None - - if s.startswith('lib/'): - out = 'eclipse-out/lib' - - p = path.join(s, 'java') - if path.exists(p): - classpathentry('src', p, out=out) - continue - - for env in ['main', 'test']: - o = None - if out: - o = out + '/' + env - elif env == 'test': - o = 'eclipse-out/test' - - for srctype in ['java', 'resources']: - p = path.join(s, 'src', env, srctype) - if path.exists(p): - classpathentry('src', p, out=o) - - for libs in [lib]: - for j in sorted(libs): - s = None - m = srcs.match(j) - if m: - prefix = m.group(1) - suffix = m.group(2) - p = path.join(prefix, "src", "%s-src.jar" % suffix) - if path.exists(p): - s = p - classpathentry('lib', j, s) - - classpathentry('con', JRE) - classpathentry('output', 'eclipse-out/classes') - - p = path.join(ROOT, '.classpath') - with open(p, 'w') as fd: - doc.writexml(fd, addindent='\t', newl='\n', encoding='UTF-8') - -try: - ext_location = retrieve_ext_location() - gen_project(args.project_name) - gen_classpath(ext_location) - gen_primary_build_tool() - - try: - check_call(['bazel', 'build', MAIN]) - except CalledProcessError: - exit(1) -except KeyboardInterrupt: - print('Interrupted by user', file=sys.stderr) - exit(1) diff --git a/tools/eclipse/project.sh b/tools/eclipse/project.sh new file mode 100755 index 0000000..8e4ed79 --- /dev/null +++ b/tools/eclipse/project.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# Copyright (C) 2017 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +`bazel query @com_googlesource_gerrit_bazlets//tools/eclipse:project --output location | sed s/BUILD:.*//`project.py -n oauth -r . From fb52284f146e149c47801ac6190fb355b46172bc Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 22 Oct 2018 08:50:09 +0900 Subject: [PATCH 10/19] Align Eclipse compiler settings with core Gerrit's Having the same compiler settings as core Gerrit means that when the project is opened in its standalone Eclipse project, the same warnings appear as when opened within the Gerrit tree (i.e. as a bundled plugin). Change-Id: I72ee1b550db591655370952a1465ad1fdf4acb9b --- .gitignore | 3 +-- .settings/org.eclipse.core.runtime.prefs | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .settings/org.eclipse.core.runtime.prefs diff --git a/.gitignore b/.gitignore index fe0be47..b6af1fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ /.classpath /.project -/.settings/org.maven.ide.eclipse.prefs -/.settings/org.eclipse.m2e.core.prefs +/.settings /bazel-bin /bazel-genfiles /bazel-oauth diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000..8667cfd --- /dev/null +++ b/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Tue Sep 02 16:59:24 PDT 2008 +eclipse.preferences.version=1 +line.separator=\n From 7365234dfa10df054f9cfcbd1b80077b55bbab0e Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 24 Oct 2018 10:56:17 +0900 Subject: [PATCH 11/19] Upgrade bazlets to latest stable-2.14 to build with 2.14.16 API Change-Id: Ic820f131066f2a3bc3837b4162736e2d1553cece --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index fb651ef..2d022ca 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "0cdf281f110834b71ae134afe0a7e3fe346f0078", + commit = "b17f700875f5f2a96942d434516ba8e6088463d4", # local_path = "/home//projects/bazlets", ) From b1a290522496088c9593db1c5650bfc1572ebdff Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 24 Oct 2018 12:20:43 +0900 Subject: [PATCH 12/19] WORKSPACE: Make commented out local_path line spaces indent consistent This makes it easier to bulk-replace all instances of the local_path line with sed. Change-Id: I0e6e71db5271be581d4b56c24769291f6f97695c --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 2d022ca..0674a88 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,7 +4,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( commit = "b17f700875f5f2a96942d434516ba8e6088463d4", - # local_path = "/home//projects/bazlets", + #local_path = "/home//projects/bazlets", ) # Snapshot Plugin API From 5250c703d64706d031abe012d172846fff2e4eaf Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 25 Oct 2018 09:57:27 +0900 Subject: [PATCH 13/19] Upgrade bazlets to latest stable-2.15 to build with 2.15.6 API Change-Id: I32102a95ed5799c30d072f770506f58de164e9e6 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 6231cff..421c0d7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "88570121c377a8a94c76915566114bf02113a7d9", + commit = "087da1f6ca119ad5c4bc443926426ddf44dcde3a", #local_path = "/home//projects/bazlets", ) From d1cccc54db046c61ec428c3253f3bc65385d3594 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 25 Oct 2018 19:10:29 +0900 Subject: [PATCH 14/19] Update bazlets to master to build with 2.16-rc1 API Change-Id: I51341543d6691e93c0f8dd791f1c539e66c424e5 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 421c0d7..71333d8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "087da1f6ca119ad5c4bc443926426ddf44dcde3a", + commit = "cc2766bbec1af19eb4d1ed2f32e4ed9a503df32b", #local_path = "/home//projects/bazlets", ) From 25fbfc9b9d82b713141d9f534686e53492fd2cb5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 9 Nov 2018 13:00:59 +0900 Subject: [PATCH 15/19] Upgrade bazlets to latest stable-2.14 to build with 2.14.17 API Change-Id: Ifb8665d3e231bd7f5f8a17a1d6ab68c10ee70f8b --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 0674a88..71f4da7 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "b17f700875f5f2a96942d434516ba8e6088463d4", + commit = "714a32382ebd02919007d3514513af4395768d80", #local_path = "/home//projects/bazlets", ) From 5ec4033cdfa1c8a16772013a56ce6f9534a397be Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 12 Nov 2018 14:13:06 -0800 Subject: [PATCH 16/19] Upgrade bazlets to latest stable-2.15 to build with 2.15.7 API Change-Id: Ia59a4e21e0d3e0225a6c455b35bf909a0ecfa5ee --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 421c0d7..0115572 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "087da1f6ca119ad5c4bc443926426ddf44dcde3a", + commit = "b54eaed487d37188120da6933b97c571519954ca", #local_path = "/home//projects/bazlets", ) From 523fbddfe52502ada07402e3a528e57295453d5d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 13 Nov 2018 15:41:27 -0800 Subject: [PATCH 17/19] Upgrade bazlets to latest master to build with 2.16-rc3 API Change-Id: I582718f7dd2f9be9017516ac89d0aa3608c72238 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 71333d8..6b0b009 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "cc2766bbec1af19eb4d1ed2f32e4ed9a503df32b", + commit = "d044cd60d37e302d9ac324f7a2c4e48b4011d4e6", #local_path = "/home//projects/bazlets", ) From d5d75417671ce0fb476e79867f0dc51eea5618b9 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 15 Nov 2018 12:26:59 -0800 Subject: [PATCH 18/19] Upgrade bazlets to latest stable-2.16 to build with 2.16 API Change-Id: Id0f1f6fc0128827d8b41e3ea6184999003f6b24a --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 6b0b009..f7b458b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "d044cd60d37e302d9ac324f7a2c4e48b4011d4e6", + commit = "c2227415d5044f8439bd47edffb0f052f8da2ac5", #local_path = "/home//projects/bazlets", ) From a49174d1dbe90cdb2aa9118b4c3a207e26ef67c4 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 10 Dec 2018 09:56:53 +0900 Subject: [PATCH 19/19] Upgrade bazlets to latest stable-2.16 to build with 2.16.1 API Change-Id: Ie3492d989646c7c4fa76ec69f84b1b4e3b5f5243 --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index f7b458b..2f9c20d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,7 @@ workspace(name = "com_github_davido_gerrit_oauth_provider") load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "c2227415d5044f8439bd47edffb0f052f8da2ac5", + commit = "d025e909c2e8a369712165309f599a2765005f2d", #local_path = "/home//projects/bazlets", )