commit 94b174a1e631eee565640f7b522b98f73fd4fae4
author Luca Milanesio <luca.milanesio@gmail.com> Mon Dec 05 18:24:20 2022 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Mon Dec 05 18:24:20 2022 +0000
tree aeb7a3972d0b4f704d46f5af0d6924b07fd02be0
parent 8995f0496bdebecc9f1613331e821cc44c48e459
parent ad767696e5aaf5bae4dbde6df9f0a4626648b69c

Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Bump project and Gerrit version to v3.4.8
  Use a simpler named binding for the LocalDiskRepositoryManager
  Associated GitRepositoryManager indirectly through a Named binding

Change-Id: I3665602e82b01d559646302bf61a7f336e6ed816

pom.xml

diff --git a/pom.xml b/pom.xml
index 7440690..dec7697 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.gerritforge</groupId>
     <artifactId>global-refdb</artifactId>
-    <version>3.4.8</version>
+    <version>3.5.1.1</version>
     <packaging>jar</packaging>
 
     <name>global-refdb</name>
@@ -38,7 +38,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <gerrit.version>${project.version}</gerrit.version>
+        <gerrit.version>3.5.1</gerrit.version>
     </properties>
 
     <dependencies>

src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java

diff --git a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java
index 0e21338..aa56889 100644
--- a/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java
+++ b/src/main/java/com/gerritforge/gerrit/globalrefdb/validation/SharedRefDbGitRepositoryManager.java
@@ -17,6 +17,7 @@
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableSet;
 import com.google.gerrit.entities.Project;
+import com.google.gerrit.entities.Project.NameKey;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.git.LocalDiskRepositoryManager;
 import com.google.gerrit.server.git.RepositoryCaseMismatchException;
@@ -113,6 +114,16 @@
     return repositoryManager().list();
   }
 
+  @Override
+  public Boolean canPerformGC() {
+    return gitRepositoryManager.canPerformGC();
+  }
+
+  @Override
+  public Status getRepositoryStatus(NameKey name) {
+    return gitRepositoryManager.getRepositoryStatus(name);
+  }
+
   private Repository wrap(Project.NameKey projectName, Repository projectRepo) {
     return sharedRefDbRepoFactory.create(projectName.get(), projectRepo, ignoredRefs);
   }