From 9d17e93013f65d75feee01cc6560b7b38c432a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Barbero?=
<mikael.barbero@eclipse-foundation.org>
Date: Thu, 9 Jul 2020 10:04:32 +0200
Subject: [PATCH] Upgrade gerrit-plugin-api dependency to 3.2.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Mikaël Barbero <mikael.barbero@eclipse-foundation.org>
---
README.md | 2 +-
eclipse-cla/.factorypath | 2 +-
eclipse-cla/pom.xml | 4 +--
.../EclipseCommitValidationListener.java | 33 ++++++++++---------
pom.xml | 2 +-
5 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index b296dae..bf008ff 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ gerrit-eca-plugin
A Gerrit plugin for controlling pushes to eclipse.org repositories.
-Provides an implementation of [Gerrit](https://code.google.com/p/gerrit/) 2.6's CommitValidationListener interface that imposes the following restrictions:
+Provides an implementation of [Gerrit](https://code.google.com/p/gerrit/) 3.2's CommitValidationListener interface that imposes the following restrictions:
* A project committer can push a commit on behalf of themselves or any other project committer
* A project committer can push a commit on behalf of a contributor if:
diff --git a/eclipse-cla/.factorypath b/eclipse-cla/.factorypath
index d8893a9..7c07d23 100644
--- a/eclipse-cla/.factorypath
+++ b/eclipse-cla/.factorypath
@@ -1,5 +1,5 @@
<factorypath>
- <factorypathentry kind="VARJAR" id="M2_REPO/com/google/gerrit/gerrit-plugin-api/2.16.18/gerrit-plugin-api-2.16.18.jar" enabled="true" runInBatchMode="false"/>
+ <factorypathentry kind="VARJAR" id="M2_REPO/com/google/gerrit/gerrit-plugin-api/3.2.2/gerrit-plugin-api-3.2.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/squareup/okhttp3/okhttp/3.14.8/okhttp-3.14.8.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/squareup/okio/okio/1.17.2/okio-1.17.2.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/com/squareup/okhttp3/logging-interceptor/3.14.8/logging-interceptor-3.14.8.jar" enabled="true" runInBatchMode="false"/>
diff --git a/eclipse-cla/pom.xml b/eclipse-cla/pom.xml
index 006ee3f..e6cd6cf 100644
--- a/eclipse-cla/pom.xml
+++ b/eclipse-cla/pom.xml
@@ -12,14 +12,14 @@
<parent>
<groupId>org.eclipse.foundation</groupId>
<artifactId>eclipse-cla-parent</artifactId>
- <version>1.0.10</version>
+ <version>1.0.11</version>
</parent>
<artifactId>eclipse-cla</artifactId>
<packaging>jar</packaging>
<name>CLA</name>
<properties>
<Gerrit-ApiType>plugin</Gerrit-ApiType>
- <Gerrit-ApiVersion>2.16.18</Gerrit-ApiVersion>
+ <Gerrit-ApiVersion>3.2.2</Gerrit-ApiVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
diff --git a/eclipse-cla/src/main/java/org/eclipse/foundation/gerrit/validation/EclipseCommitValidationListener.java b/eclipse-cla/src/main/java/org/eclipse/foundation/gerrit/validation/EclipseCommitValidationListener.java
index 87f6900..186f476 100644
--- a/eclipse-cla/src/main/java/org/eclipse/foundation/gerrit/validation/EclipseCommitValidationListener.java
+++ b/eclipse-cla/src/main/java/org/eclipse/foundation/gerrit/validation/EclipseCommitValidationListener.java
@@ -9,10 +9,23 @@
*/
package org.eclipse.foundation.gerrit.validation;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.Project;
import com.google.gerrit.extensions.annotations.Listen;
import com.google.gerrit.extensions.restapi.AuthException;
-import com.google.gerrit.reviewdb.client.Account.Id;
-import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountException;
import com.google.gerrit.server.account.AccountManager;
@@ -29,24 +42,14 @@ import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gerrit.server.permissions.RefPermission;
import com.google.inject.Inject;
import com.google.inject.Singleton;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
+
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.FooterKey;
import org.eclipse.jgit.revwalk.FooterLine;
import org.eclipse.jgit.revwalk.RevCommit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import retrofit2.Response;
/**
@@ -418,7 +421,7 @@ public class EclipseCommitValidationListener implements CommitValidationListener
*
* We look up both using mailto: and gerrit:
*/
- Optional<Id> id = accountManager.lookup(ExternalId.SCHEME_MAILTO + author.getEmailAddress());
+ Optional<Account.Id> id = accountManager.lookup(ExternalId.SCHEME_MAILTO + author.getEmailAddress());
if (!id.isPresent())
id =
accountManager.lookup(
diff --git a/pom.xml b/pom.xml
index 1e6adb8..0b9d875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<groupId>org.eclipse.foundation</groupId>
<artifactId>eclipse-cla-parent</artifactId>
- <version>1.0.10</version>
+ <version>1.0.11</version>
<packaging>pom</packaging>
<modules>
--
GitLab