From cdff6cfc4f84c0c55593d295425eb2d3941773e0 Mon Sep 17 00:00:00 2001 From: "Alexander D. Kanevskiy" Date: Sat, 17 Aug 2013 00:15:23 +0300 Subject: [PATCH 1/7] Mark ALREADY_MERGED changes as merged in the DB and run hooks If a change in the merge queue is marked ALREADY_MERGED, it is likely a result of a bug in the merge code. It means the change has been merged, but neither properly marked as such in the DB nor propagated to hooks for sending email notifications or being mentioned in stream-events. Calling setMerged() instead of setMergedPatchSet() properly marks the change as merged in the database and runs hooks for sending emails and events. This is an improved version of I44548cce039e303a86d579b0b0d76b12ad9bdcfb and fix for issue 2044. Bug: issue 2044 Change-Id: I4e95a74e58ff51a54ed54a02298c719e19f6fd0d --- .../src/main/java/com/google/gerrit/server/git/MergeOp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index 9715d9c47f..d86e48c3d2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -599,7 +599,7 @@ public class MergeOp { if (rw.isMergedInto(commit, branchTip)) { commit.statusCode = CommitMergeStatus.ALREADY_MERGED; try { - setMergedPatchSet(chg.getId(), ps.getId()); + setMerged(chg, null); } catch (OrmException e) { log.error("Cannot mark change " + chg.getId() + " merged", e); } From f9f46bdca706bf24dc03f6ed3cf712778a9180fd Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 2 Sep 2013 15:46:23 +0200 Subject: [PATCH 2/7] Fix example for 'test-submit rule' in Prolog cookbook Since commit b1f730b89458d9d094bc93f3d328ad744c39bbb5 it is 'test-submit rule' and not anymore 'test-submit-rule'. Change-Id: I4c32893afa1410af5347a8b659c5811aac218f63 Signed-off-by: Edwin Kempin --- Documentation/prolog-cookbook.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/prolog-cookbook.txt b/Documentation/prolog-cookbook.txt index 7912cf26a1..170d11a76a 100644 --- a/Documentation/prolog-cookbook.txt +++ b/Documentation/prolog-cookbook.txt @@ -303,11 +303,11 @@ Testing submit rules The prolog environment running the `submit_rule` is loaded with state describing the change that is being evaluated. The easiest way to load this state is to test your `submit_rule` against a real change on a running gerrit instance. The command -link:cmd-test-submit-rule.html[test-submit-rule] loads a specific change and executes +link:cmd-test-submit-rule.html[test-submit rule] loads a specific change and executes the `submit_rule`. It optionally reads the rule from from `stdin` to facilitate easy testing. ==== - cat rules.pl | ssh gerrit_srv gerrit test-submit-rule I45e080b105a50a625cc8e1fb5b357c0bfabe6d68 -s + cat rules.pl | ssh gerrit_srv gerrit test-submit rule I45e080b105a50a625cc8e1fb5b357c0bfabe6d68 -s ==== Prolog vs Gerrit plugin for project specific submit rules From 357b5be893088b4dcd69262d1dec7b6127cf567d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 17 Sep 2013 17:34:29 +0900 Subject: [PATCH 3/7] NPE when deleting draft patch set when previous draft already deleted If a change has 3 patch sets, all of which are drafts, and draft patch set 2 is deleted, attempting to delete draft patch set 3 (the current patch set) will result in NPE. The reason is that on deleting a draft patch set which is the current patch set, the current patch set is set to the previous patch set whose ID is calculated by subtracting 1 from the deleted patch set ID. This does not work if the previous patch set has already been deleted. Instead, set the current patch set to the highest patch set ID that is available. Bug: Issue 2128 Change-Id: I235d4d943a5525e8223218a97f4702e26f09a69e --- .../gerrit/server/changedetail/DeleteDraftPatchSet.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java index adec292ac2..d20b0f63a6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java @@ -112,9 +112,7 @@ public class DeleteDraftPatchSet implements Callable { } if (change.currentPatchSetId().equals(patchSetId)) { try { - PatchSet.Id id = - new PatchSet.Id(patchSetId.getParentKey(), patchSetId.get() - 1); - change.setCurrentPatchSet(patchSetInfoFactory.get(db, id)); + change.setCurrentPatchSet(patchSetInfoFactory.get(db, highestId)); } catch (PatchSetInfoNotAvailableException e) { throw new NoSuchChangeException(changeId); } From 5ff6ebe2ed8322e2c94973d347c78d492db7ec24 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 18 Sep 2013 09:09:42 +0900 Subject: [PATCH 4/7] Remove documentation links from admin page The links for Change-Id and Signed-off-by documentation in the admin page are hard-coded to specific versions on the the gerrit-documentation.googlesource.com site. This causes two problems. Firstly, they are not links to local versions, and secondly it is easy to forget to update them and they become out of date. Remove the links. Administrators should be capable of finding the relevant pages in the documentation by themselves. Bug: Issue 2127 Change-Id: Idd4ddd1126e0631615d564173a02e3047aa87559 --- .../com/google/gerrit/client/admin/AdminConstants.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties index 1637919e0d..bf738472fb 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminConstants.properties @@ -22,8 +22,8 @@ projects = All projects projectRepoBrowser = Repository Browser useContentMerge = Automatically resolve conflicts useContributorAgreements = Require a valid contributor agreement to upload -useSignedOffBy = Require Signed-off-by in commit message -requireChangeID = Require Change-Id in commit message +useSignedOffBy = Require Signed-off-by in commit message +requireChangeID = Require Change-Id in commit message headingGroupOptions = Group Options isVisibleToAll = Make group visible to all registered users. buttonSaveGroupOptions = Save Group Options From 72fa3c242290a962873077c47d0fd82fceda049e Mon Sep 17 00:00:00 2001 From: Jan Opacki Date: Sun, 2 Jun 2013 15:49:12 +0200 Subject: [PATCH 5/7] Fix change stuck in SUBMITTED state but actually merged This behavior is caused by submitting a commit that has a tag. Method MergeUtil.markCleanMerges is used by each merge strategy to update the status of a change if it was a clean merge. It skips commits that are identified as accepted and their entire ancestry chain. If a commit is tagged, method MergeOp.getAlreadyAccepted identifies it as accepted (even if it is not merged yet). Fix prevents a commit that is referred by a tag to be included in alreadyAccepted set. If such commit is already merged then it will be covered anyway by adding heads to alreadyAccepted. Add a corresponding test that pushes a commit with a tag Bug: Issue 600 Change-Id: If00247b809b985eaf60ef5ef09fad0f475fb06b9 (cherry picked from commit b22ee233f1ef880cd84beb5939e332de1d7d704e) --- .../google/gerrit/acceptance/git/GitUtil.java | 6 ++- .../gerrit/acceptance/git/PushOneCommit.java | 10 ++++- .../gerrit/acceptance/git/SubmitOnPushIT.java | 44 +++++++++++++++---- .../com/google/gerrit/server/git/MergeOp.java | 3 +- 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/GitUtil.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/GitUtil.java index c8158c07e4..045207c677 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/GitUtil.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/GitUtil.java @@ -146,9 +146,13 @@ public class GitUtil { } } - public static PushResult pushHead(Git git, String ref) throws GitAPIException { + public static PushResult pushHead(Git git, String ref, boolean pushTags) + throws GitAPIException { PushCommand pushCmd = git.push(); pushCmd.setRefSpecs(new RefSpec("HEAD:" + ref)); + if (pushTags) { + pushCmd.setPushTags(); + } Iterable r = pushCmd.call(); return Iterables.getOnlyElement(r); } diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java index fb1b59206d..4c32f2ff82 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/PushOneCommit.java @@ -58,6 +58,7 @@ public class PushOneCommit { private final String fileName; private final String content; private String changeId; + private String tagName; public PushOneCommit(ReviewDb db, PersonIdent i) { this(db, i, SUBJECT, FILE_NAME, FILE_CONTENT); @@ -86,7 +87,14 @@ public class PushOneCommit { } else { changeId = createCommit(git, i, subject); } - return new Result(db, ref, pushHead(git, ref), changeId, subject); + if (tagName != null) { + git.tag().setName(tagName).setAnnotated(false).call(); + } + return new Result(db, ref, pushHead(git, ref, tagName != null), changeId, subject); + } + + public void setTag(final String tagName) { + this.tagName = tagName; } public static class Result { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java index fa85927d8e..ab97d192c2 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java @@ -113,7 +113,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest { @Test public void submitOnPush() throws GitAPIException, OrmException, IOException, ConfigInvalidException { - grantSubmit(project, "refs/for/refs/heads/master"); + grant(Permission.SUBMIT, project, "refs/for/refs/heads/master"); PushOneCommit.Result r = pushTo("refs/for/master%submit"); r.assertOkStatus(); r.assertChange(Change.Status.MERGED, null, admin); @@ -121,10 +121,26 @@ public class SubmitOnPushIT extends AbstractDaemonTest { assertCommit(project, "refs/heads/master"); } + @Test + public void submitOnPushWithTag() throws GitAPIException, OrmException, + IOException, ConfigInvalidException { + grant(Permission.SUBMIT, project, "refs/for/refs/heads/master"); + grant(Permission.CREATE, project, "refs/tags/*"); + final String tag = "v1.0"; + PushOneCommit push = new PushOneCommit(db, admin.getIdent()); + push.setTag(tag); + PushOneCommit.Result r = push.to(git, "refs/for/master%submit"); + r.assertOkStatus(); + r.assertChange(Change.Status.MERGED, null, admin); + assertSubmitApproval(r.getPatchSetId()); + assertCommit(project, "refs/heads/master"); + assertTag(project, "refs/heads/master", tag); + } + @Test public void submitOnPushToRefsMetaConfig() throws GitAPIException, OrmException, IOException, ConfigInvalidException { - grantSubmit(project, "refs/for/refs/meta/config"); + grant(Permission.SUBMIT, project, "refs/for/refs/meta/config"); git.fetch().setRefSpecs(new RefSpec("refs/meta/config:refs/meta/config")).call(); ObjectId objectId = git.getRepository().getRef("refs/meta/config").getObjectId(); @@ -145,7 +161,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest { push(master, "one change", "a.txt", "some content"); git.checkout().setName(objectId.getName()).call(); - grantSubmit(project, "refs/for/refs/heads/master"); + grant(Permission.SUBMIT, project, "refs/for/refs/heads/master"); PushOneCommit.Result r = push("refs/for/master%submit", "other change", "a.txt", "other content"); r.assertOkStatus(); @@ -161,7 +177,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest { push(master, "one change", "a.txt", "some content"); git.checkout().setName(objectId.getName()).call(); - grantSubmit(project, "refs/for/refs/heads/master"); + grant(Permission.SUBMIT, project, "refs/for/refs/heads/master"); PushOneCommit.Result r = push("refs/for/master%submit", "other change", "b.txt", "other content"); r.assertOkStatus(); @@ -175,7 +191,7 @@ public class SubmitOnPushIT extends AbstractDaemonTest { PushOneCommit.Result r = push("refs/for/master", PushOneCommit.SUBJECT, "a.txt", "some content"); - grantSubmit(project, "refs/for/refs/heads/master"); + grant(Permission.SUBMIT, project, "refs/for/refs/heads/master"); r = push("refs/for/master%submit", PushOneCommit.SUBJECT, "a.txt", "other content", r.getChangeId()); r.assertOkStatus(); @@ -220,13 +236,13 @@ public class SubmitOnPushIT extends AbstractDaemonTest { r.assertErrorStatus("branch " + branchName + " not found"); } - private void grantSubmit(Project.NameKey project, String ref) + private void grant(String permission, Project.NameKey project, String ref) throws RepositoryNotFoundException, IOException, ConfigInvalidException { MetaDataUpdate md = metaDataUpdateFactory.create(project); - md.setMessage("Grant submit on " + ref); + md.setMessage(String.format("Grant %s on %s", permission, ref)); ProjectConfig config = ProjectConfig.read(md); AccessSection s = config.getAccessSection(ref, true); - Permission p = s.getPermission(Permission.SUBMIT, true); + Permission p = s.getPermission(permission, true); AccountGroup adminGroup = groupCache.get(new AccountGroup.NameKey("Administrators")); p.add(new PermissionRule(config.resolve(adminGroup))); config.commit(md); @@ -277,6 +293,18 @@ public class SubmitOnPushIT extends AbstractDaemonTest { } } + private void assertTag(Project.NameKey project, String branch, String tagName) + throws IOException { + Repository r = repoManager.openRepository(project); + try { + ObjectId headCommit = r.getRef(branch).getObjectId(); + ObjectId taggedCommit = r.getRef(tagName).getObjectId(); + assertEquals(headCommit, taggedCommit); + } finally { + r.close(); + } + } + private PushOneCommit.Result pushTo(String ref) throws GitAPIException, IOException { PushOneCommit push = new PushOneCommit(db, admin.getIdent()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index d86e48c3d2..3a9eaa39b2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -456,8 +456,7 @@ public class MergeOp { try { for (final Ref r : repo.getAllRefs().values()) { - if (r.getName().startsWith(Constants.R_HEADS) - || r.getName().startsWith(Constants.R_TAGS)) { + if (r.getName().startsWith(Constants.R_HEADS)) { try { alreadyAccepted.add(rw.parseCommit(r.getObjectId())); } catch (IncorrectObjectTypeException iote) { From 6b12b35d2a6aa151e9cafe9a052b5f6f2ced7211 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Fri, 6 Sep 2013 19:01:00 +0200 Subject: [PATCH 6/7] Fix installation of plugins e51c428fe5ef3960f4990e1c0471d067783d4718 broke the unregistering of plugin owned SSH command by passing wrong instance to the ConcurrentMap.remove() function. bae9e58ddd68992473307787fb01e022f5969fee was trying to fix it, but broke it for the installation of plugins by throwing the `IllegalStateException` in case the old registration handle wasn't found. But it's perfectly possible and even wanted during plugin reloading: registration handle is replaced and the old one cannot be found. Moreover, bae9e58ddd68992473307787fb01e022f5969fee didn't fix all places: the same bug in unregistering of SSH commands in DispatchCommandProvider.replace() method wasn't fixed. Change-Id: I21132d4f7aec58347acbf50d75a962cb8251201f --- .../google/gerrit/sshd/DispatchCommandProvider.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java index c7594bc6d1..ce1da95fed 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java @@ -60,10 +60,7 @@ public class DispatchCommandProvider implements Provider { return new RegistrationHandle() { @Override public void remove() { - if (!m.remove(name.value(), commandProvider)) { - throw new IllegalStateException(String.format( - "can not unregister command: %s", name.value())); - } + m.remove(name.value(), commandProvider); } }; } @@ -71,11 +68,12 @@ public class DispatchCommandProvider implements Provider { public RegistrationHandle replace(final CommandName name, final Provider cmd) { final ConcurrentMap m = getMap(); - m.put(name.value(), new CommandProvider(cmd, null)); + final CommandProvider commandProvider = new CommandProvider(cmd, null); + m.put(name.value(), commandProvider); return new RegistrationHandle() { @Override public void remove() { - m.remove(name.value(), cmd); + m.remove(name.value(), commandProvider); } }; } From 01cea13727927133ad9a820287a19f989a5c0d5c Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Wed, 18 Sep 2013 12:26:06 -0700 Subject: [PATCH 7/7] Set version to 2.7 Change-Id: I49a7fc97fd6d4f199c25774faa50ec4a826ae64a --- gerrit-acceptance-tests/pom.xml | 2 +- gerrit-antlr/pom.xml | 2 +- gerrit-cache-h2/pom.xml | 2 +- gerrit-common/pom.xml | 2 +- gerrit-extension-api/pom.xml | 2 +- gerrit-gwtdebug/pom.xml | 2 +- gerrit-gwtexpui/pom.xml | 2 +- gerrit-gwtui/pom.xml | 2 +- gerrit-httpd/pom.xml | 2 +- gerrit-launcher/pom.xml | 2 +- gerrit-main/pom.xml | 2 +- gerrit-openid/pom.xml | 2 +- gerrit-patch-commonsnet/pom.xml | 2 +- gerrit-patch-jgit/pom.xml | 2 +- gerrit-pgm/pom.xml | 2 +- gerrit-plugin-api/pom.xml | 2 +- gerrit-plugin-archetype/pom.xml | 2 +- gerrit-plugin-gwt-archetype/pom.xml | 2 +- gerrit-plugin-gwtui/pom.xml | 2 +- gerrit-plugin-js-archetype/pom.xml | 2 +- gerrit-prettify/pom.xml | 2 +- gerrit-reviewdb/pom.xml | 2 +- gerrit-server/pom.xml | 2 +- gerrit-sshd/pom.xml | 2 +- gerrit-util-cli/pom.xml | 2 +- gerrit-util-ssl/pom.xml | 2 +- gerrit-war/pom.xml | 2 +- plugins/commit-message-length-validator | 2 +- plugins/replication | 2 +- plugins/reviewnotes | 2 +- pom.xml | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gerrit-acceptance-tests/pom.xml b/gerrit-acceptance-tests/pom.xml index b71546dc1d..63facba25c 100644 --- a/gerrit-acceptance-tests/pom.xml +++ b/gerrit-acceptance-tests/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-acceptance-tests diff --git a/gerrit-antlr/pom.xml b/gerrit-antlr/pom.xml index e1eba403b4..c17e01eecf 100644 --- a/gerrit-antlr/pom.xml +++ b/gerrit-antlr/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-antlr diff --git a/gerrit-cache-h2/pom.xml b/gerrit-cache-h2/pom.xml index 4abd77c25c..80ab03bf6a 100644 --- a/gerrit-cache-h2/pom.xml +++ b/gerrit-cache-h2/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-cache-h2 diff --git a/gerrit-common/pom.xml b/gerrit-common/pom.xml index 8f133e92ac..efa72852fa 100644 --- a/gerrit-common/pom.xml +++ b/gerrit-common/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-common diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index 4f572097dd..bcdbfab239 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-extension-api diff --git a/gerrit-gwtdebug/pom.xml b/gerrit-gwtdebug/pom.xml index 0622e1b4cd..83c10ebc49 100644 --- a/gerrit-gwtdebug/pom.xml +++ b/gerrit-gwtdebug/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-gwtdebug diff --git a/gerrit-gwtexpui/pom.xml b/gerrit-gwtexpui/pom.xml index 86845d387d..2c5ec624cc 100644 --- a/gerrit-gwtexpui/pom.xml +++ b/gerrit-gwtexpui/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-gwtexpui diff --git a/gerrit-gwtui/pom.xml b/gerrit-gwtui/pom.xml index 7d09989647..17065fee94 100644 --- a/gerrit-gwtui/pom.xml +++ b/gerrit-gwtui/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-gwtui diff --git a/gerrit-httpd/pom.xml b/gerrit-httpd/pom.xml index d2189a2878..e498cac29a 100644 --- a/gerrit-httpd/pom.xml +++ b/gerrit-httpd/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-httpd diff --git a/gerrit-launcher/pom.xml b/gerrit-launcher/pom.xml index 396c09cbaa..e04accab81 100644 --- a/gerrit-launcher/pom.xml +++ b/gerrit-launcher/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-launcher diff --git a/gerrit-main/pom.xml b/gerrit-main/pom.xml index 25c9401a9f..46b0a9f11b 100644 --- a/gerrit-main/pom.xml +++ b/gerrit-main/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-main diff --git a/gerrit-openid/pom.xml b/gerrit-openid/pom.xml index a81cf17f82..1e738677b9 100644 --- a/gerrit-openid/pom.xml +++ b/gerrit-openid/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-openid diff --git a/gerrit-patch-commonsnet/pom.xml b/gerrit-patch-commonsnet/pom.xml index 77187213ad..82c1d826f6 100644 --- a/gerrit-patch-commonsnet/pom.xml +++ b/gerrit-patch-commonsnet/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-patch-commonsnet diff --git a/gerrit-patch-jgit/pom.xml b/gerrit-patch-jgit/pom.xml index 222d6229ee..a1b85b3959 100644 --- a/gerrit-patch-jgit/pom.xml +++ b/gerrit-patch-jgit/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-patch-jgit diff --git a/gerrit-pgm/pom.xml b/gerrit-pgm/pom.xml index c7121c7a68..9acb912fdd 100644 --- a/gerrit-pgm/pom.xml +++ b/gerrit-pgm/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-pgm diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index 569ed50ab9..10df1969c2 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-plugin-api diff --git a/gerrit-plugin-archetype/pom.xml b/gerrit-plugin-archetype/pom.xml index 9b954f9fc9..f721be4784 100644 --- a/gerrit-plugin-archetype/pom.xml +++ b/gerrit-plugin-archetype/pom.xml @@ -21,7 +21,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-plugin-archetype diff --git a/gerrit-plugin-gwt-archetype/pom.xml b/gerrit-plugin-gwt-archetype/pom.xml index 66f5a8f2ef..9ea0cd0f57 100644 --- a/gerrit-plugin-gwt-archetype/pom.xml +++ b/gerrit-plugin-gwt-archetype/pom.xml @@ -21,7 +21,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-plugin-gwt-archetype diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 5195204d4e..3d1b923235 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-plugin-gwtui diff --git a/gerrit-plugin-js-archetype/pom.xml b/gerrit-plugin-js-archetype/pom.xml index 5b12f7d0df..2972a8ed17 100644 --- a/gerrit-plugin-js-archetype/pom.xml +++ b/gerrit-plugin-js-archetype/pom.xml @@ -21,7 +21,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-plugin-js-archetype diff --git a/gerrit-prettify/pom.xml b/gerrit-prettify/pom.xml index fa4ae55590..fafc3993a1 100644 --- a/gerrit-prettify/pom.xml +++ b/gerrit-prettify/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-prettify diff --git a/gerrit-reviewdb/pom.xml b/gerrit-reviewdb/pom.xml index d69c5c58b2..5543c53ba1 100644 --- a/gerrit-reviewdb/pom.xml +++ b/gerrit-reviewdb/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-reviewdb diff --git a/gerrit-server/pom.xml b/gerrit-server/pom.xml index 68b1625c89..e5436347ce 100644 --- a/gerrit-server/pom.xml +++ b/gerrit-server/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-server diff --git a/gerrit-sshd/pom.xml b/gerrit-sshd/pom.xml index 75a43c0159..ab9bd433d0 100644 --- a/gerrit-sshd/pom.xml +++ b/gerrit-sshd/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-sshd diff --git a/gerrit-util-cli/pom.xml b/gerrit-util-cli/pom.xml index f2325a490d..9a897c7927 100644 --- a/gerrit-util-cli/pom.xml +++ b/gerrit-util-cli/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-util-cli diff --git a/gerrit-util-ssl/pom.xml b/gerrit-util-ssl/pom.xml index 1e941e0d88..e687912334 100644 --- a/gerrit-util-ssl/pom.xml +++ b/gerrit-util-ssl/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-util-ssl diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index 0855b7dd35..b6c90e1f4a 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent - 2.7-SNAPSHOT + 2.7 gerrit-war diff --git a/plugins/commit-message-length-validator b/plugins/commit-message-length-validator index 74df0dc1e7..23bde32a6f 160000 --- a/plugins/commit-message-length-validator +++ b/plugins/commit-message-length-validator @@ -1 +1 @@ -Subproject commit 74df0dc1e7704224645718c130548fecc7c55494 +Subproject commit 23bde32a6f67ef39f2a368851e3abbedc50db710 diff --git a/plugins/replication b/plugins/replication index 26b0185a6e..df8cb39367 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 26b0185a6e70c5ccf8b3444fea0014168067f0e1 +Subproject commit df8cb393676880b6e27b42d4b49492be0804c0ee diff --git a/plugins/reviewnotes b/plugins/reviewnotes index 1490f20e92..41fdacc58c 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit 1490f20e92303da4998335a0198c75c2e5d38724 +Subproject commit 41fdacc58c59c35b456197d356bd6f12f6897d8e diff --git a/pom.xml b/pom.xml index f7798bd79c..20310cf345 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ limitations under the License. com.google.gerrit gerrit-parent pom - 2.7-SNAPSHOT + 2.7 Gerrit Code Review - Parent http://code.google.com/p/gerrit/