Skip to content
Snippets Groups Projects
Commit 9d17e930 authored by Mikaël Barbero's avatar Mikaël Barbero :dagger: Committed by Mikaël Barbero
Browse files

Upgrade gerrit-plugin-api dependency to 3.2.2


Signed-off-by: default avatarMikaël Barbero <mikael.barbero@eclipse-foundation.org>
parent 7a8cca2f
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
<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"/>
......
......@@ -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>
......
......@@ -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(
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment