Merge branch 'stable-2.11'
* stable-2.11:
Assign Gravatar as default avatar generator
Align with Gitblit 1.7.0-SNAPSHOT (latest development branch)
Align Java source code level to Gerrit 1.7
Change-Id: If7b7ac947d9795ec60c8abcfb10039e17d85eee8
diff --git a/pom.xml b/pom.xml
index 3809503..b4ea451 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,8 +96,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/GitBlitServletModule.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/GitBlitServletModule.java
index 9012053..11946bf 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/GitBlitServletModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/GitBlitServletModule.java
@@ -18,6 +18,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.AvatarGenerator;
+import com.gitblit.GravatarGenerator;
import com.gitblit.IStoredSettings;
import com.gitblit.guice.IPublicKeyManagerProvider;
import com.gitblit.guice.ITicketServiceProvider;
@@ -73,6 +75,7 @@
log.info("Configuring Gitblit core services");
bind(IStoredSettings.class).to(GitBlitSettings.class);
bind(XssFilter.class).to(JSoupXssFilter.class);
+ bind(AvatarGenerator.class).to(GravatarGenerator.class);
// bind complex providers
bind(IPublicKeyManager.class).toProvider(IPublicKeyManagerProvider.class);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
index ce74ac6..229416c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitblit/auth/GerritToGitBlitUserService.java
@@ -144,11 +144,11 @@
String gerritToken = (String) httpRequest.getAttribute("gerrit-token");
httpRequest.getSession().setAttribute(Constants.AUTHENTICATION_TYPE,
AuthenticationType.CONTAINER);
-
+
if (Strings.isNullOrEmpty(gerritUsername)
|| Strings.isNullOrEmpty(gerritToken)) {
return GerritToGitBlitUserModel.getAnonymous(projectControl);
- } else {
+ } else {
return authenticateSSO(gerritUsername, gerritToken);
}
}
