From 11c2b500b86e1a02a97f65708796e1605eb91808 Mon Sep 17 00:00:00 2001
From: acxz <17132214+acxz@users.noreply.github.com>
Date: Sat, 4 Apr 2020 01:36:01 -0400
Subject: [PATCH] [bazel] Remove deprecated and now non-existent flag (#7886)

---
 .bazelrc                 | 3 ---
 bazel/ray_deps_setup.bzl | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index c8c524b55..19659aef0 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -32,9 +32,6 @@ build --host_copt="-Wno-microsoft-unqualified-friend"
 build --per_file_copt="-\\.(asm|S)$,external/com_github_grpc_grpc/.*@-DGRPC_BAZEL_BUILD"
 build --http_timeout_scaling=5.0
 build:iwyu --experimental_action_listener=//:iwyu_cpp
-# This workaround is due to an incompatibility of
-# bazel_common/tools/maven/pom_file.bzl with Bazel 1.0
-build --incompatible_depset_is_not_iterable=false
 
 # Print relative paths when possible
 build:windows --attempt_to_print_relative_paths
diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
index eb796be87..9e3f272f7 100644
--- a/bazel/ray_deps_setup.bzl
+++ b/bazel/ray_deps_setup.bzl
@@ -99,8 +99,8 @@ def ray_deps_setup():
 
     auto_http_archive(
         name = "bazel_common",
-        url = "https://github.com/google/bazel-common/archive/f1115e0f777f08c3cdb115526c4e663005bec69b.tar.gz",
-        sha256 = "50dea89af2e1334e18742f18c91c860446de8d1596947fe87e3cdb0d27b6f8f3",
+        url = "https://github.com/google/bazel-common/archive/084aadd3b854cad5d5e754a7e7d958ac531e6801.tar.gz",
+        sha256 = "a6e372118bc961b182a3a86344c0385b6b509882929c6b12dc03bb5084c775d5",
     )
 
     auto_http_archive(