Merge branch 'stable-2.11'
* stable-2.11:
Build with API version 2.11.5
Build with API version 2.10.7
Build with API version 2.9.4
Merge made by the 'ours' strategy to avoid conflicts.
Change-Id: I12a4d3a07d8ba3cbcf0529497b8bd49401071fb8
diff --git a/BUCK b/BUCK
index 4eb7273..36a0c92 100644
--- a/BUCK
+++ b/BUCK
@@ -8,7 +8,6 @@
'Gerrit-HttpModule: com.googlesource.gerrit.plugins.branchnetwork.NetworkGraphModule'
],
deps = [
- '//lib/commons:io',
'//lib:gson',
],
)
diff --git a/pom.xml b/pom.xml
index 2be9968..1a800a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>branch-network</artifactId>
<groupId>com.googlesource.gerrit.plugins.branchnetwork</groupId>
- <version>2.11.5</version>
+ <version>2.12-rc0</version>
<name>Gerrit - Branch network display plugin</name>
<url>http://maven.apache.org</url>
<properties>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java b/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java
index f11d989..aa98e68 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java
@@ -26,10 +26,10 @@
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.lib.Repository;
-import com.google.gerrit.common.data.GitWebType;
+import com.google.gerrit.common.data.GitwebType;
import com.google.gerrit.extensions.annotations.PluginCanonicalWebUrl;
-import com.google.gerrit.httpd.GitWebConfig;
import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.server.config.GitwebConfig;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.project.NoSuchProjectException;
import com.google.gerrit.server.project.ProjectControl;
@@ -46,12 +46,12 @@
private String canonicalPath;
private Factory projectControl;
private GitRepositoryManager repoManager;
- private GitWebConfig gitWebConfig;
+ private GitwebConfig gitWebConfig;
private String pluginCanonicalWebUrl;
@Inject
public GitGraphServlet(@PluginCanonicalWebUrl String url,
- GitWebConfig gitWebConfig,
+ GitwebConfig gitWebConfig,
final ProjectControl.Factory projectControl,
final GitRepositoryManager repoManager)
throws MalformedURLException {
@@ -111,7 +111,7 @@
String.format("%1$snetwork_data_chunk/%2$s/?nethash=", canonicalPath,
repoName);
- GitWebType type = gitWebConfig.getGitWebType();
+ GitwebType type = gitWebConfig.getGitwebType();
if (type == null) {
out.println("<html>ERROR: invalid gitweb configuration</html>");
} else {
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index e6cacce..af0ec61 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -15,6 +15,8 @@
branch = ?p=${project}
revision = ?p=${project}
filehistory = ?p=${project}
+ roottree = ?p=${project}
+ file = ?p=${project}
```
Note that the `project, ``branch`, `revision` and `filehistory` settings
