commit 31f17c92c9d34c9fc6795251a7232c82a5338d4f
author David Ostrovsky <david@ostrovsky.org> Sun Feb 07 17:31:34 2021 +0100
committer David Ostrovsky <david@ostrovsky.org> Sun Feb 07 17:32:28 2021 +0100
tree 7856f409dec9f1e1b1940dbeb1720147c6fd4609
parent b5867f452be52dbd6e7bd26baaa24b885a4b9899
parent 4332dc53ec3be27bb9f556f20b3fe29a5b50c0e5

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Bump Bazel version to 4.0.0
  MultiBaseLocalDiskRepositoryManagerTest: fix for running on Mac from Eclipse

Change-Id: I2bdb265d36c3872cfb44d91436cd11d9e8b139b0

.bazelversion

diff --git a/.bazelversion b/.bazelversion
index 7c69a55d..fcdb2e1 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.7.0
+4.0.0

javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java

diff --git a/javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java b/javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
index 29f520b..4902830 100644
--- a/javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
+++ b/javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
@@ -93,12 +93,14 @@
     Repository repo = repoManager.createRepository(someProjectKey);
     assertThat(repo.getDirectory()).isNotNull();
     assertThat(repo.getDirectory().exists()).isTrue();
-    assertThat(repo.getDirectory().getParent()).isEqualTo(alternateBasePath.toString());
+    assertThat(repo.getDirectory().getParent())
+        .isEqualTo(alternateBasePath.toRealPath().toString());
 
     repo = repoManager.openRepository(someProjectKey);
     assertThat(repo.getDirectory()).isNotNull();
     assertThat(repo.getDirectory().exists()).isTrue();
-    assertThat(repo.getDirectory().getParent()).isEqualTo(alternateBasePath.toString());
+    assertThat(repo.getDirectory().getParent())
+        .isEqualTo(alternateBasePath.toRealPath().toString());
 
     assertThat(repoManager.getBasePath(someProjectKey).toAbsolutePath().toString())
         .isEqualTo(alternateBasePath.toString());