From 942a39cd53720c36934d37f43868f7e27846d4bf Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Mon, 11 Nov 2019 11:27:32 +0100 Subject: [PATCH 1/4] Post/Delete GPG keys: Remove incorrect comments Originally this change was based on change Ie5ff96a0c which handles LOCK_FAILURE in PublicKeyStore#save, but since this change was rebased out of the series the comments regarding LOCK_FAILURE are not correct and should be dropped. Signed-off-by: Edwin Kempin Change-Id: Ic2406c1f32698dd9f1d725e09bff477fb7b606e3 --- java/com/google/gerrit/gpg/server/DeleteGpgKey.java | 1 - java/com/google/gerrit/gpg/server/PostGpgKeys.java | 1 - 2 files changed, 2 deletions(-) diff --git a/java/com/google/gerrit/gpg/server/DeleteGpgKey.java b/java/com/google/gerrit/gpg/server/DeleteGpgKey.java index 5953e72c54..68bd2d9b4e 100644 --- a/java/com/google/gerrit/gpg/server/DeleteGpgKey.java +++ b/java/com/google/gerrit/gpg/server/DeleteGpgKey.java @@ -109,7 +109,6 @@ public class DeleteGpgKey implements RestModifyView { } break; case LOCK_FAILURE: - // should not happen since this case is already handled by PublicKeyStore#save case FORCED: case IO_FAILURE: case NEW: diff --git a/java/com/google/gerrit/gpg/server/PostGpgKeys.java b/java/com/google/gerrit/gpg/server/PostGpgKeys.java index bb3e46e037..0bb4ff7434 100644 --- a/java/com/google/gerrit/gpg/server/PostGpgKeys.java +++ b/java/com/google/gerrit/gpg/server/PostGpgKeys.java @@ -250,7 +250,6 @@ public class PostGpgKeys implements RestModifyView Date: Sun, 10 Nov 2019 06:38:02 +0100 Subject: [PATCH 2/4] ReviewerAddedEvent: extend event with 'adder' Several other events (ReviewerDeletedEvent, CommentAddedEvent, etc.) contain the event originator but this information is missing for ReviewerAddedEvent. Change-Id: I6112b898eb7d5a1d06bee5d21eaa1d66d5ff9cc9 Signed-off-by: Jacek Centkowski --- Documentation/cmd-stream-events.txt | 2 ++ java/com/google/gerrit/server/events/ReviewerAddedEvent.java | 1 + .../google/gerrit/server/events/StreamEventsApiListener.java | 1 + 3 files changed, 4 insertions(+) diff --git a/Documentation/cmd-stream-events.txt b/Documentation/cmd-stream-events.txt index e8c5213e8f..f0ad460380 100644 --- a/Documentation/cmd-stream-events.txt +++ b/Documentation/cmd-stream-events.txt @@ -234,6 +234,8 @@ patchSet:: link:json.html#patchSet[patchSet attribute] reviewer:: link:json.html#account[account attribute] +adder:: user that added the reviewer as link:json.html#account[account attribute] + eventCreatedOn:: Time in seconds since the UNIX epoch when this event was created. diff --git a/java/com/google/gerrit/server/events/ReviewerAddedEvent.java b/java/com/google/gerrit/server/events/ReviewerAddedEvent.java index 9644456d4f..ea6bda3e74 100644 --- a/java/com/google/gerrit/server/events/ReviewerAddedEvent.java +++ b/java/com/google/gerrit/server/events/ReviewerAddedEvent.java @@ -21,6 +21,7 @@ import com.google.gerrit.server.data.AccountAttribute; public class ReviewerAddedEvent extends PatchSetEvent { static final String TYPE = "reviewer-added"; public Supplier reviewer; + public Supplier adder; public ReviewerAddedEvent(Change change) { super(TYPE, change); diff --git a/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/java/com/google/gerrit/server/events/StreamEventsApiListener.java index 3add4cac13..5b2c368ae8 100644 --- a/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -317,6 +317,7 @@ public class StreamEventsApiListener event.change = changeAttributeSupplier(change, notes); event.patchSet = patchSetAttributeSupplier(change, psUtil.current(notes)); + event.adder = accountAttributeSupplier(ev.getWho()); for (AccountInfo reviewer : ev.getReviewers()) { event.reviewer = accountAttributeSupplier(reviewer); dispatcher.run(d -> d.postEvent(event)); From 82dca5378baa328ac8f1740d66329d7fbb62757d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 11 Nov 2019 07:04:31 -0800 Subject: [PATCH 3/4] Set version to 3.0.4 Change-Id: I3445ca0945c092f588c63383cdfe666c1587cf25 --- tools/maven/gerrit-acceptance-framework_pom.xml | 2 +- tools/maven/gerrit-extension-api_pom.xml | 2 +- tools/maven/gerrit-plugin-api_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index 73b7d28815..bd26343f82 100644 --- a/tools/maven/gerrit-acceptance-framework_pom.xml +++ b/tools/maven/gerrit-acceptance-framework_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 3.0.4-SNAPSHOT + 3.0.4 jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml index e196608bfa..c7f5372b98 100644 --- a/tools/maven/gerrit-extension-api_pom.xml +++ b/tools/maven/gerrit-extension-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 3.0.4-SNAPSHOT + 3.0.4 jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml index 1727e88192..421faf1972 100644 --- a/tools/maven/gerrit-plugin-api_pom.xml +++ b/tools/maven/gerrit-plugin-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 3.0.4-SNAPSHOT + 3.0.4 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index 9f9e8d4af6..595355c537 100644 --- a/tools/maven/gerrit-war_pom.xml +++ b/tools/maven/gerrit-war_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 3.0.4-SNAPSHOT + 3.0.4 war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index c6c039ab1d..32cf1b9c4a 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "3.0.4-SNAPSHOT" +GERRIT_VERSION = "3.0.4" From 3ac05104aea1dc8faf6773b8d8f11f2b7f0bf5ba Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 11 Nov 2019 11:58:40 -0800 Subject: [PATCH 4/4] Set version to 3.0.5-SNAPSHOT Change-Id: Id968bd347efd8279ea94b514a0fbace8beaa167d --- tools/maven/gerrit-acceptance-framework_pom.xml | 2 +- tools/maven/gerrit-extension-api_pom.xml | 2 +- tools/maven/gerrit-plugin-api_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index bd26343f82..945d2be764 100644 --- a/tools/maven/gerrit-acceptance-framework_pom.xml +++ b/tools/maven/gerrit-acceptance-framework_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 3.0.4 + 3.0.5-SNAPSHOT jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/tools/maven/gerrit-extension-api_pom.xml b/tools/maven/gerrit-extension-api_pom.xml index c7f5372b98..3ff5cfc30b 100644 --- a/tools/maven/gerrit-extension-api_pom.xml +++ b/tools/maven/gerrit-extension-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 3.0.4 + 3.0.5-SNAPSHOT jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/tools/maven/gerrit-plugin-api_pom.xml b/tools/maven/gerrit-plugin-api_pom.xml index 421faf1972..f4af83570b 100644 --- a/tools/maven/gerrit-plugin-api_pom.xml +++ b/tools/maven/gerrit-plugin-api_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 3.0.4 + 3.0.5-SNAPSHOT jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index 595355c537..6cbcf58ade 100644 --- a/tools/maven/gerrit-war_pom.xml +++ b/tools/maven/gerrit-war_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 3.0.4 + 3.0.5-SNAPSHOT war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 32cf1b9c4a..cbc86ac35d 100644 --- a/version.bzl +++ b/version.bzl @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = "3.0.4" +GERRIT_VERSION = "3.0.5-SNAPSHOT"