Merge branch 'stable-2.11' into stable-2.12
Included changes:
- Update gitblit to version 1.7.1
- Use a local build of GitBlit 1.7.1 for static res
Change-Id: I22aaf7e2db295e8937a7ca9f76480334968d3158
diff --git a/pom.xml b/pom.xml
index c523d2c..8c690af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
<artifactId>gitblit-plugin</artifactId>
<description>GitBlit for Gerrit integrated as a plugin</description>
<name>Gerrit - GitBlit Plugin</name>
- <version>2.11.10</version>
+ <version>2.12</version>
<licenses>
<license>
<name>Apache License 2.0</name>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java
index 6e3d101..d32e5e9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/GerritGitBlitContext.java
@@ -60,7 +60,7 @@
void init(ServletContext context) {
// Manually configure IRuntimeManager
- runtime.setBaseFolder(sitePaths.site_path);
+ runtime.setBaseFolder(sitePaths.site_path.toFile());
runtime.getStatus().servletContainer = context.getServerInfo();
runtime.start();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java
index 67a3090..e81ef0d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/app/GitBlitSettings.java
@@ -57,7 +57,7 @@
this.properties = new Properties();
this.repoManager = repoManager;
this.config = new GitBlitUrlsConfig(config);
- this.etcDir = sitePaths.etc_dir;
+ this.etcDir = sitePaths.etc_dir.toFile();
load();
}
@@ -77,8 +77,8 @@
try {
properties = new Properties();
properties.load(resin);
- properties.put("git.repositoriesFolder", repoManager.getBasePath()
- .getAbsolutePath());
+ properties.put("git.repositoriesFolder",
+ getBasePath().getAbsolutePath());
properties.put("realm.userService",
GerritToGitBlitUserService.class.getName());
if (properties.get("web.otherUrls") != null) {
@@ -112,7 +112,7 @@
}
public File getBasePath() {
- return repoManager.getBasePath();
+ return repoManager.getBasePath().toFile();
}
@Override
