Merge branch 'stable-3.7' into stable-3.8 * stable-3.7: Build plugin against the Gerrit 3.7.3 version Bump version to 3.7.2 Change-Id: If9b80bcd77e9a8a54a2d9f076f55a7ba78d79f0b

diff --git a/README.md b/README.md
index d01069d..5a95019 100644
--- a/README.md
+++ b/README.md

@@ -86,19 +86,6 @@
   cd github
   mvn -DjavaVersion=1.8 install
 
-### GitHub API
-
-In order to access GitHub API, we have used the lucamilanesio fork of Kohsuke API 
-layer hosted on GitHub at https://github.com/lucamilanesio/github-api.
-
-You need to clone and build the GitHub API as pre-requisite for building the
-GitHub plugin for Gerrit.
-
-Example:
-  git clone https://github.com/lucamilanesio/github-api.git
-  cd github-api
-  mvn install -DskipTests=true
-
 ### singleusergroup plugin
 
 You need to install the singleusergroup plugin for Gerrit
@@ -139,10 +126,10 @@
 
 ### Running Gerrit init to configure GitHub OAuth
 
-* java -jar buck-out/gen/gerrit.war `$gerrit_site`
+* java -jar bazel-bin/gerrit.war init -d `$GERRIT_SITE`
 * User Authentication
-* Authentication methodi []: HTTP
-* Ger username from custom HTTP header [Y/n]? Y
+* Authentication method []: HTTP
+* Get username from custom HTTP header [Y/n]? Y
 * Username HTTP header []: GITHUB_USER
 * SSO logout URL : /oauth/reset
 

diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml
index ea779be..346b5d9 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>3.7.3</version>
+    <version>3.8.0-rc5</version>
   </parent>
   <artifactId>github-oauth</artifactId>
   <name>Gerrit Code Review - GitHub OAuth login</name>
@@ -87,24 +87,6 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.5</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.17</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>github-api</artifactId>
       <version>1.116</version>

diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml
index 5d8ea22..266ad9f 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>3.7.3</version>
+    <version>3.8.0-rc5</version>
   </parent>
 
   <artifactId>github-plugin</artifactId>

diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java
index dda0205..9d027b1 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/GitImportJob.java

@@ -158,4 +158,7 @@
   public String getRepository() {
     return repository;
   }
+
+  @Override
+  public void showDuration(boolean enabled) {}
 }

diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
index f706539..52d7b34 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestImportJob.java

@@ -316,4 +316,7 @@
 
   @Override
   public void update(int progress) {}
+
+  @Override
+  public void showDuration(boolean enabled) {}
 }

diff --git a/pom.xml b/pom.xml
index 9f64be9..7d39fb8 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>3.7.3</version>
+  <version>3.8.0-rc5</version>
   <name>Gerrit Code Review - GitHub integration</name>
   <url>http://www.gerritforge.com</url>
   <packaging>pom</packaging>