Merge branch 'stable-2.10'
* changes:
I1f69bece3: Bump github-api to 1.57
Change-Id: Iddbee69036e3b3f00b99f0cfcc0d80825f330d88
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml
index 6a55e54..c0ab78f 100644
--- a/github-oauth/pom.xml
+++ b/github-oauth/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>com.googlesource.gerrit.plugins.github</groupId>
<artifactId>github-parent</artifactId>
- <version>2.10-SNAPSHOT</version>
+ <version>2.11-SNAPSHOT</version>
</parent>
<artifactId>github-oauth</artifactId>
<name>Gerrit Code Review - GitHub OAuth login</name>
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedLoginHttpResponse.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedLoginHttpResponse.java
index 5e4b586..e9bd369 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedLoginHttpResponse.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/AuthenticatedLoginHttpResponse.java
@@ -15,6 +15,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.Collection;
import java.util.Collections;
@@ -174,7 +175,8 @@
@Override
public PrintWriter getWriter() throws IOException {
- return new PrintWriter(outputStream);
+ return new PrintWriter(new OutputStreamWriter(outputStream,
+ characterEncoding));
}
@Override
diff --git a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java
index cd8b32e..91f3b86 100644
--- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java
+++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/OAuthGitFilter.java
@@ -150,7 +150,12 @@
gerritPassword =
generateRandomGerritPassword(username, httpRequest, httpResponse,
chain);
- httpResponse.sendRedirect(getRequestPathWithQueryString(httpRequest));
+ if (Strings.isNullOrEmpty(gerritPassword)) {
+ httpResponse.sendError(SC_FORBIDDEN,
+ "Unable to generate Gerrit password for Git Basic-Auth");
+ } else {
+ httpResponse.sendRedirect(getRequestPathWithQueryString(httpRequest));
+ }
return;
}
diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml
index 9f61ef8..fcf52a5 100644
--- a/github-plugin/pom.xml
+++ b/github-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>github-parent</artifactId>
<groupId>com.googlesource.gerrit.plugins.github</groupId>
- <version>2.10-SNAPSHOT</version>
+ <version>2.11-SNAPSHOT</version>
</parent>
<artifactId>github-plugin</artifactId>
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/InitGitHub.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/InitGitHub.java
index 5e56cf9..261587f 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/InitGitHub.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/InitGitHub.java
@@ -13,9 +13,9 @@
// limitations under the License.
package com.googlesource.gerrit.plugins.github;
-import com.google.gerrit.pgm.init.InitStep;
-import com.google.gerrit.pgm.init.Section;
-import com.google.gerrit.pgm.util.ConsoleUI;
+import com.google.gerrit.pgm.init.api.ConsoleUI;
+import com.google.gerrit.pgm.init.api.InitStep;
+import com.google.gerrit.pgm.init.api.Section;
import com.google.inject.Inject;
public class InitGitHub implements InitStep {
diff --git a/pom.xml b/pom.xml
index e65c897..948a764 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlesource.gerrit.plugins.github</groupId>
<artifactId>github-parent</artifactId>
- <version>2.10-SNAPSHOT</version>
+ <version>2.11-SNAPSHOT</version>
<name>Gerrit Code Review - GitHub integration</name>
<url>http://www.gerritforge.com</url>
<packaging>pom</packaging>
@@ -247,6 +247,15 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
<repositories>
<repository>
<releases>
