Adapt the plugin to recent master Change-Id: I6d91cd8731afad99ca2577114f03d63188aa7c44
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml index 7a45b1d..1e93dbd 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.3.0</version> + <version>3.4.0-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/GitHubMyselfWrapper.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubMyselfWrapper.java index 247d6a6..9bdae85 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubMyselfWrapper.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/GitHubMyselfWrapper.java
@@ -19,7 +19,6 @@ import java.util.Date; import java.util.List; import java.util.Map; -import java.util.Set; import org.kohsuke.github.GHEmail; import org.kohsuke.github.GHEventInfo; import org.kohsuke.github.GHGist;
diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml index 58fcd13..58bfd2c 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.3.0</version> + <version>3.4.0-SNAPSHOT</version> </parent> <artifactId>github-plugin</artifactId> @@ -135,7 +135,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.1</version> + <version>2.8.6</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId>
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java index 26def83..f80af85 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/replication/RemoteSiteUser.java
@@ -35,4 +35,9 @@ public GroupMembership getEffectiveGroups() { return effectiveGroups; } + + @Override + public Object getCacheKey() { + return effectiveGroups.getKnownGroups(); + } }
diff --git a/pom.xml b/pom.xml index 0be79b3..6ab0c16 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.3.0</version> + <version>3.4.0-SNAPSHOT</version> <name>Gerrit Code Review - GitHub integration</name> <url>http://www.gerritforge.com</url> <packaging>pom</packaging> @@ -290,6 +290,12 @@ </repositories> <dependencies> <dependency> + <groupId>com.ryanharter.auto.value</groupId> + <artifactId>auto-value-gson</artifactId> + <version>1.3.0</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId> <version>1.18.16</version>