Merge changes I81c2ec44,I342f74b0 * changes: FindBugs error: include encoding for wrapped login response FindBugs integration for detecting common errors
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml index f472e8a..154acbe 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-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 bb5bba5..22bc8e0 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>