Bump to Gerrit 2.9-SNAPSHOT
Change-Id: If966f9af68d2fd128b1412c5d5dd807f1e312f56
diff --git a/github-oauth/pom.xml b/github-oauth/pom.xml
index f3acf76..b228453 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.8-SNAPSHOT</version>
+ <version>2.9-SNAPSHOT</version>
</parent>
<artifactId>github-oauth</artifactId>
<name>Gerrit Code Review - GitHub OAuth login</name>
diff --git a/github-plugin/pom.xml b/github-plugin/pom.xml
index a40b2fc..e41077d 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.8-SNAPSHOT</version>
+ <version>2.9-SNAPSHOT</version>
</parent>
<artifactId>github-plugin</artifactId>
diff --git a/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java b/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java
index 4a8943c..c73bdc4 100644
--- a/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java
+++ b/github-plugin/src/main/java/com/googlesrouce/gerrit/plugins/github/git/PullRequestCreateChange.java
@@ -15,6 +15,7 @@
package com.googlesrouce.gerrit.plugins.github.git;
import java.io.IOException;
+import java.sql.Timestamp;
import java.util.Iterator;
import java.util.List;
@@ -62,6 +63,7 @@
import com.google.gerrit.server.project.ProjectControl.Factory;
import com.google.gerrit.server.project.RefControl;
import com.google.gerrit.server.ssh.NoSshInfo;
+import com.google.gerrit.server.util.TimeUtil;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
@@ -215,7 +217,8 @@
InvalidChangeOperationException, IOException {
Change change =
new Change(changeKey, new Change.Id(db.nextChangeId()),
- pullRequestOwner, new Branch.NameKey(project, destRef.getName()));
+ pullRequestOwner, new Branch.NameKey(project, destRef.getName()),
+ TimeUtil.nowTs());
if (topic != null) {
change.setTopic(topic);
}
@@ -238,7 +241,7 @@
}
ins.setMessage(
- buildChangeMessage(db, change, pullRequestOwner, pullRequestMessage))
+ buildChangeMessage(db, change, newPatchSet, pullRequestOwner, pullRequestMessage))
.insert();
return change.getId();
@@ -263,11 +266,12 @@
}
private ChangeMessage buildChangeMessage(ReviewDb db, Change dest,
- Account.Id pullRequestAuthorId, String pullRequestMessage)
- throws OrmException {
+ PatchSet newPatchSet, Account.Id pullRequestAuthorId,
+ String pullRequestMessage) throws OrmException {
ChangeMessage cmsg =
new ChangeMessage(new ChangeMessage.Key(dest.getId(),
- ChangeUtil.messageUUID(db)), pullRequestAuthorId, null);
+ ChangeUtil.messageUUID(db)), pullRequestAuthorId, TimeUtil.nowTs(),
+ newPatchSet.getId());
cmsg.setMessage(pullRequestMessage);
return cmsg;
}
diff --git a/pom.xml b/pom.xml
index a83d34d..1951d74 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.8-SNAPSHOT</version>
+ <version>2.9-SNAPSHOT</version>
<name>Gerrit Code Review - GitHub integration</name>
<url>http://www.gerritforge.com</url>
<packaging>pom</packaging>
