Bump to Gerrit API Ver. to 2.15-SNAPSHOT Adapt code-base and classes to the new Gerrit API Ver. 2.15 Change-Id: I2e66cdc653fd55cfdcb08031cc77a12a9baa9fb7
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml index d1b4ccc..669fc92 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.14-SNAPSHOT</version> + <version>2.15-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/IdentifiedUserGitHubLoginProvider.java b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/IdentifiedUserGitHubLoginProvider.java index 4c92e2e..594a927 100644 --- a/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/IdentifiedUserGitHubLoginProvider.java +++ b/github-oauth/src/main/java/com/googlesource/gerrit/plugins/github/oauth/IdentifiedUserGitHubLoginProvider.java
@@ -25,7 +25,7 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; -import com.google.gerrit.server.account.ExternalId; +import com.google.gerrit.server.account.externalids.ExternalId; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton;
diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml index eac938b..331e0f9 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.14-SNAPSHOT</version> + <version>2.15-SNAPSHOT</version> </parent> <artifactId>github-plugin</artifactId>
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java index c143cb1..f60d113 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/filters/GitHubOAuthFilter.java
@@ -19,7 +19,7 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountCache; -import com.google.gerrit.server.account.ExternalId; +import com.google.gerrit.server.account.externalids.ExternalId; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton;
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java index 1af821b..bcb71c9 100644 --- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java +++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/git/PullRequestCreateChange.java
@@ -31,7 +31,6 @@ import com.google.gerrit.server.change.ChangeInserter; import com.google.gerrit.server.change.PatchSetInserter; import com.google.gerrit.server.git.IntegrationException; -import com.google.gerrit.server.git.validators.CommitValidators.Policy; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; @@ -218,7 +217,7 @@ PatchSetInserter patchSetInserter = patchSetInserterFactory.create(changeControl, psId, cherryPickCommit); patchSetInserter.setMessage(pullRequestMessage); - patchSetInserter.setValidatePolicy(Policy.NONE); + patchSetInserter.setValidate(false); bu.addOp(change.getId(), patchSetInserter); bu.execute(); @@ -229,7 +228,7 @@ Change.Key changeKey, Project.NameKey project, Ref destRef, Account.Id pullRequestOwner, RevCommit pullRequestCommit, RefControl refControl, String pullRequestMessage, String topic) - throws OrmException, UpdateException, RestApiException { + throws OrmException, UpdateException, RestApiException, IOException { Change change = new Change(changeKey, new Change.Id(db.nextChangeId()), pullRequestOwner, new Branch.NameKey(project, destRef.getName()),
diff --git a/pom.xml b/pom.xml index 4ae3dcf..c4049df 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.14-SNAPSHOT</version> + <version>2.15-SNAPSHOT</version> <name>Gerrit Code Review - GitHub integration</name> <url>http://www.gerritforge.com</url> <packaging>pom</packaging>