From b088807f4ddfc57e4c3e585cdca1b3a805753a9e Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 30 Oct 2020 15:51:05 +0000 Subject: [PATCH 01/13] Set version to 2.16.23 Change-Id: Ia533bb65648b3799fc742ec982058e11712ac78e --- 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-plugin-gwtui_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index 07b3560a79eb..4cc6277c178c 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 - 2.16.23-SNAPSHOT + 2.16.23 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 c71c5d20a6ab..29424a7a0e68 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 - 2.16.23-SNAPSHOT + 2.16.23 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 ccdbb22c9eb9..2e9517fb7a9d 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 - 2.16.23-SNAPSHOT + 2.16.23 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml index c89b1f5310e1..c351f2c07061 100644 --- a/tools/maven/gerrit-plugin-gwtui_pom.xml +++ b/tools/maven/gerrit-plugin-gwtui_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.16.23-SNAPSHOT + 2.16.23 jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index 0c72200cb7b5..0231bd1aa72d 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 - 2.16.23-SNAPSHOT + 2.16.23 war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 746238cba414..2d2f9c8730d5 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 = "2.16.23-SNAPSHOT" +GERRIT_VERSION = "2.16.23" From 17a21582b86913d5a9a9fae155e0c33797c0f553 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 30 Oct 2020 16:41:15 +0000 Subject: [PATCH 02/13] Set version to 2.16.24-SNAPSHOT Change-Id: Ie3b33382fe2b8d64894f89afc25061ecd17ece90 --- 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-plugin-gwtui_pom.xml | 2 +- tools/maven/gerrit-war_pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/maven/gerrit-acceptance-framework_pom.xml b/tools/maven/gerrit-acceptance-framework_pom.xml index 4cc6277c178c..d3c5f358136e 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 - 2.16.23 + 2.16.24-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 29424a7a0e68..7ab1abfc0a48 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 - 2.16.23 + 2.16.24-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 2e9517fb7a9d..e783e366a6da 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 - 2.16.23 + 2.16.24-SNAPSHOT jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/tools/maven/gerrit-plugin-gwtui_pom.xml b/tools/maven/gerrit-plugin-gwtui_pom.xml index c351f2c07061..61adfae4b5fe 100644 --- a/tools/maven/gerrit-plugin-gwtui_pom.xml +++ b/tools/maven/gerrit-plugin-gwtui_pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.16.23 + 2.16.24-SNAPSHOT jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/tools/maven/gerrit-war_pom.xml b/tools/maven/gerrit-war_pom.xml index 0231bd1aa72d..ff8f63f8241f 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 - 2.16.23 + 2.16.24-SNAPSHOT war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 2d2f9c8730d5..63e650ea4612 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 = "2.16.23" +GERRIT_VERSION = "2.16.24-SNAPSHOT" From fd266bf32ba071e7a7a0d25e17ad2524e6e02d89 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Fri, 30 Oct 2020 13:59:38 -0600 Subject: [PATCH 03/13] Update git submodules * Update plugins/replication from branch 'stable-2.16' to 8fdb0f9ac0a7f68b3f942cb4a9fd4c94e488ab57 - ReplicationStorageIT: Wait for all pushes without order Some tests don't have a predefined order for which events will be replicated first. Using a timeout based on a single replication event is flawed when we don't know the expected order. Instead, use a timeout for the group of events and ignore the order. For two events replicating to a single remote with a single thread, we expect the complete replication to take twice as long. Two events replicating to two remotes will use one thread each and therefore not take any longer than the single remote case. Change-Id: Ieb21b7eee32105eab5b5a15a35159bb4a837e363 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 53e083fd0f17..8fdb0f9ac0a7 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 53e083fd0f17d1403b4d150e66655907c1ea139d +Subproject commit 8fdb0f9ac0a7f68b3f942cb4a9fd4c94e488ab57 From ed7fa1d1c6cd82f0b4a0fc3b38d452ae089cf255 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Tue, 3 Nov 2020 08:19:05 -0700 Subject: [PATCH 04/13] Update git submodules * Update plugins/replication from branch 'stable-3.2' to bbb3bb300a7c9ab43ef7196fe366882a14f83487 - PushOne: Don't call delta.add(ref) twice This is already called as part of the condition, it doesn't need to be called again inside the body. Change-Id: Ieb11f738534ed01d09125ac6ef325ee472cb0b44 --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index 9fee431456cf..bbb3bb300a7c 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 9fee431456cf53f190bc34d1cb0a43c62a0c1c60 +Subproject commit bbb3bb300a7c9ab43ef7196fe366882a14f83487 From 5cb673abba7a39afaea0ca9fd5beeeb1d8a67575 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Tue, 3 Nov 2020 12:26:03 -0500 Subject: [PATCH 05/13] Fix release_noter --link option for plugin changes Before this change, the link option was using 'gerrit' as the project for all generated links to changes. Fix those in the plugins case, by using 'plugins/name' instead in that generated url. Bug: Issue 13623 Change-Id: Ifb08f376eac8c4a8d6f86bb345828f9282a314dd --- tools/release_noter/release_noter.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/tools/release_noter/release_noter.py b/tools/release_noter/release_noter.py index 4b1062046362..05fa0236c83f 100644 --- a/tools/release_noter/release_noter.py +++ b/tools/release_noter/release_noter.py @@ -187,12 +187,14 @@ class Task(Enum): class Commit: sha1 = None subject = None + component = None issues = set() def reset(self, signature, task): if signature is not None: self.sha1 = signature.group(1) self.subject = None + self.component = None self.issues = set() return Task.finish_headers return task @@ -238,24 +240,25 @@ def finish(commit, commits, gerrit, options, cwd): if noted_commit.subject == commit.subject: return Commit() set_component(commit, commits, cwd) - link_subject(commit, gerrit, options) + link_subject(commit, gerrit, options, cwd) escape_these(commit) return Commit() def set_component(commit, commits, cwd): - component_found = False + component_found = None for component in Components: for sentinel in component.value.sentinels: - if not component_found: + if component_found is None: if re.match(f"{GIT_PATH}/{PLUGINS}{component.value.name.lower()}", cwd): - component_found = True + component_found = component elif sentinel.lower() in commit.subject.lower(): - component_found = True - if component_found: + component_found = component + if component_found is not None: commits[component].append(commit) - if not component_found: + if component_found is None: commits[Components.otherwise].append(commit) + commit.component = component_found def init_components(): @@ -265,13 +268,17 @@ def init_components(): return components -def link_subject(commit, gerrit, options): +def link_subject(commit, gerrit, options, cwd): if options.link: gerrit_change = gerrit.get(f"{COMMIT_URL}{commit.sha1}") if not gerrit_change: return change_number = gerrit_change[0]["_number"] - change_address = f"{GERRIT_URL}{CHANGE_URL}{change_number}" + plugin_wd = re.search(f"{GIT_PATH}/({PLUGINS}.+)", cwd) + if plugin_wd is not None: + change_address = f"{GERRIT_URL}/c/{plugin_wd.group(1)}/+/{change_number}" + else: + change_address = f"{GERRIT_URL}{CHANGE_URL}{change_number}" short_sha1 = commit.sha1[0:7] commit.subject = f"[{short_sha1}]({change_address})\n {commit.subject}" From 7086aae782648abfdd7da2b142e4b5242221a52a Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Tue, 3 Nov 2020 15:50:11 -0500 Subject: [PATCH 06/13] Documentation: Fix dev-core-plugins asciidoctor (numbered list) warnings Bug: Issue 13626 Change-Id: I0b716e4374a85d4841d6d9176215f0239d80429a --- Documentation/dev-core-plugins.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/dev-core-plugins.txt b/Documentation/dev-core-plugins.txt index aa519806ddd0..6b777d3986d4 100644 --- a/Documentation/dev-core-plugins.txt +++ b/Documentation/dev-core-plugins.txt @@ -170,7 +170,7 @@ Apache License Version 2.0. The plugin functionality has gone outside the Gerrit-related scope, has a clear scope or conflict with other core plugins or existing and planned Gerrit core features. - ++ NOTE: The plugin would need to remain core until the planned replacement gets implemented. Otherwise the feature is likely missing between the removal and planned implementation times. From 0834ec78a7f7a3c6e2693bacc77079cf3eb0ee51 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Tue, 3 Nov 2020 16:24:37 -0700 Subject: [PATCH 07/13] Update git submodules * Update plugins/replication from branch 'stable-3.2' to f25727a949121dd6709264c22c7e12fa8fb30f75 - ReplicationQueue: Remove unused isPersisted param Since Ie83763e4a9fe13522f356b569fc2360fa5883224, all callers set this to false. Change-Id: I38a8a31853f5d2bc3b292b49bd050bc34f6408fe --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index bbb3bb300a7c..f25727a94912 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit bbb3bb300a7c9ab43ef7196fe366882a14f83487 +Subproject commit f25727a949121dd6709264c22c7e12fa8fb30f75 From 85c187970304767ae64b4f46d90e98110960a954 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 8 Sep 2020 01:42:03 +0200 Subject: [PATCH 08/13] Document jgit options respected by gerrit gc Change-Id: I097dd88d906008d7af1ee9483f6b8ec96380ff72 --- Documentation/config-gerrit.txt | 53 +++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index eb751ac91981..f35dfc728450 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -5245,6 +5245,49 @@ Sample `etc/jgit.config` file: trustFolderStat = false ---- +[[jgit-gc]] +=== Section gc + +Options in section gc are used when command link:cmd-gc.html[gerrit gc] is used +or scheduled via options link:cmd-gc.html#gc.startTime[gc.startTime] and +link:cmd-gc.html#gc.interval[gc.interval]. + +[[gc.auto]]gc.auto:: ++ +When there are approximately more than this many loose objects in the repository, +auto gc will pack them. Some commands use this command to perform a light-weight +garbage collection from time to time. The default value is 6700. ++ +Setting this to 0 disables not only automatic packing based on the number of +loose objects, but any other heuristic auto gc will otherwise use to determine +if there’s work to do, such as link:#gc.autoPackLimit[gc.autoPackLimit]. + +[[gc.autodetach]]gc.autodetach:: ++ +Makes auto gc run in a background thread. Default is `true`. + +[[gc.autopacklimit]]gc.autopacklimit:: ++ +When there are more than this many packs that are not marked with `*.keep` file +in the repository, auto gc consolidates them into one larger pack. The +default value is 50. Setting this to 0 disables it. Setting `gc.auto` to 0 will +also disable this. + +[[gc.packRefs]]gc.packRefs:: ++ +This variable determines whether gc runs git pack-refs. The default is `true`. + +[[gc.reflogExpire]]gc.reflogExpire:: ++ +Removes reflog entries older than this time; defaults to 90 days. The value "now" +expires all entries immediately, and "never" suppresses expiration altogether. + +[[gc.reflogExpireUnreachable]]gc.reflogExpireUnreachable:: ++ +Removes reflog entries older than this time and not reachable from the +current tip; defaults to 30 days. The value "now" expires all entries immediately, +and "never" suppresses expiration altogether. + [[jgit-protocol]] === Section protocol @@ -5262,6 +5305,16 @@ Supported versions: 2:: wire protocol version 2. Speeds up fetches from repositories with many refs by allowing the client to specify which refs to list before the server lists them. +[[jgit-receive]] +=== Section receive + +[[receive.autogc]]receive.autogc:: ++ +By default, `git-receive-pack` will run auto gc after receiving data from git-push and updating refs. +You can stop it by setting this variable to `false`. This is recommended in gerrit to avoid the +additional load this creates. Instead schedule gc using link:cmd-gc.html#gc.startTime[gc.startTime] +and link:cmd-gc.html#gc.interval[gc.interval] or e.g. in a cron job that runs gc in a separate process. + GERRIT ------ Part of link:index.html[Gerrit Code Review] From 848ad1a81316f0c27af8bda4ca2e1d92f5e7731b Mon Sep 17 00:00:00 2001 From: Ben Rohlfs Date: Wed, 28 Oct 2020 09:14:10 +0100 Subject: [PATCH 09/13] Flip the defaults of the attention and assignee flags By default the attention set becomes enabled and the assignee feature becomes disabled. Change-Id: Ic55a731eb5136306dd14c6bad80e1e160185793a (cherry picked from commit 4427d4373466526926910e6b31adf01b3ad54642) --- Documentation/config-gerrit.txt | 4 ++-- Documentation/user-attention-set.txt | 7 +++---- java/com/google/gerrit/server/mail/EmailSettings.java | 2 +- .../google/gerrit/server/restapi/config/GetServerInfo.java | 5 +++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index 5e318cf25d09..c9b6c04b945b 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -1284,14 +1284,14 @@ The default is false. If set to true, then all UI features for using and interacting with the attention set are enabled. + -The default is false for now, but will be changed to true in Q2 2020. +The default is true. [[change.enableAssignee]]change.enableAssignee:: + If set to true, then all UI features for using and interacting with the assignee are enabled. + -The default is true for now, but will be changed to false in Q2 2020. +The default is false. [[change.largeChange]]change.largeChange:: + diff --git a/Documentation/user-attention-set.txt b/Documentation/user-attention-set.txt index 7e219d4c92bd..bca338a87ebe 100644 --- a/Documentation/user-attention-set.txt +++ b/Documentation/user-attention-set.txt @@ -156,10 +156,9 @@ been replaced by the attention set. === For Gerrit Admins -The Attention Set will be part of the upcoming 3.3 release (due late 2020). -We are testing it on `googlesource.com` right now. If you build your Gerrit from -master, you can enable it using -link:config-gerrit.html#change.enableAttentionSet[enableAttentionSet]. +The Attention Set will be part of the upcoming 3.3 release (due late 2020). It +is enabled by default, but you can disable it by setting +link:config-gerrit.html#change.enableAttentionSet[enableAttentionSet] to false. === Important note for all host owners, project owners, and bot owners diff --git a/java/com/google/gerrit/server/mail/EmailSettings.java b/java/com/google/gerrit/server/mail/EmailSettings.java index 1ac6eb6fadc9..15b61d018010 100644 --- a/java/com/google/gerrit/server/mail/EmailSettings.java +++ b/java/com/google/gerrit/server/mail/EmailSettings.java @@ -61,6 +61,6 @@ public class EmailSettings { TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS), TimeUnit.MILLISECONDS); sendNewPatchsetEmails = cfg.getBoolean("change", null, "sendNewPatchsetEmails", true); - isAttentionSetEnabled = cfg.getBoolean("change", null, "enableAttentionSet", false); + isAttentionSetEnabled = cfg.getBoolean("change", null, "enableAttentionSet", true); } } diff --git a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java index d08ee50f86ee..780c60aa0741 100644 --- a/java/com/google/gerrit/server/restapi/config/GetServerInfo.java +++ b/java/com/google/gerrit/server/restapi/config/GetServerInfo.java @@ -238,8 +238,9 @@ private ChangeConfigInfo getChangeInfo() { info.mergeabilityComputationBehavior = MergeabilityComputationBehavior.fromConfig(config).name(); info.enableAttentionSet = - toBoolean(this.config.getBoolean("change", null, "enableAttentionSet", false)); - info.enableAssignee = toBoolean(this.config.getBoolean("change", null, "enableAssignee", true)); + toBoolean(this.config.getBoolean("change", null, "enableAttentionSet", true)); + info.enableAssignee = + toBoolean(this.config.getBoolean("change", null, "enableAssignee", false)); return info; } From f8bb95a0c652fe7d51410a5ed79a60f416e18279 Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Thu, 5 Nov 2020 16:43:04 +0100 Subject: [PATCH 10/13] Update git submodules * Update plugins/replication from branch 'stable-3.2' to 3991d53b30a02c0ffa6fc34385c963257de23349 - CreateProjectTask.java: use interface instead of implementation ReplicationDestinations interface should be used in CreateProjectTask so that specific implementation can be materialized by Guice (DI). Change-Id: If7cb21adff5c3feeeea7568c504e8e37d5c08f9e --- plugins/replication | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/replication b/plugins/replication index f25727a94912..3991d53b30a0 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit f25727a949121dd6709264c22c7e12fa8fb30f75 +Subproject commit 3991d53b30a02c0ffa6fc34385c963257de23349 From bef704ebfa77934d235208509e64ad7ec40019b4 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Thu, 5 Nov 2020 11:29:36 +0000 Subject: [PATCH 11/13] Documentation: fix Bazel options for a Java 8 build Update the dev-bazel.txt documentation with the correct options to trigger a legacy Java 8 build. Change-Id: Ib1f883207182bd9b1b0ed3ef8ef7e57db84967ef --- Documentation/dev-bazel.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/dev-bazel.txt b/Documentation/dev-bazel.txt index 086e8360785d..96cc67ff6165 100644 --- a/Documentation/dev-bazel.txt +++ b/Documentation/dev-bazel.txt @@ -61,8 +61,7 @@ Java 8 is a legacy Java release and support for Java 8 will be discontinued in future gerrit releases. To build Gerrit with Java 8 language level, run: ``` - $ bazel build --java_toolchain //tools:error_prone_warnings_toolchain_java8 - :release + $ bazel build --java_toolchain //tools:error_prone_warnings_toolchain :release ``` [[java-11]] From 310924924d6a7a8774437a57030379989162ff5e Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Mon, 9 Nov 2020 12:06:20 -0500 Subject: [PATCH 12/13] Set version to 3.3.0-rc5 Change-Id: Ib4d116c73c7e66600eec4cbae2c2698bbe249b9a --- 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 14c726ea4f5b..343edf0dc1d4 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.3.0-SNAPSHOT + 3.3.0-rc5 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 bd323ba8b1ba..bfa09bb4a860 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.3.0-SNAPSHOT + 3.3.0-rc5 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 3b059e5402b4..b6f606f5cd0e 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.3.0-SNAPSHOT + 3.3.0-rc5 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 b8fa13227fe7..b7ff8b23c2b4 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.3.0-SNAPSHOT + 3.3.0-rc5 war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 78b286b556b7..f7d33ab0d472 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.3.0-SNAPSHOT" +GERRIT_VERSION = "3.3.0-rc5" From 56b29e12ea019c9d21aed35d7300e19e585f615e Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Mon, 9 Nov 2020 13:37:56 -0500 Subject: [PATCH 13/13] Set version to 3.3.0-SNAPSHOT Change-Id: Id7b3ee315115e801850007b428aea28e3a5acfd2 --- 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 343edf0dc1d4..14c726ea4f5b 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.3.0-rc5 + 3.3.0-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 bfa09bb4a860..bd323ba8b1ba 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.3.0-rc5 + 3.3.0-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 b6f606f5cd0e..3b059e5402b4 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.3.0-rc5 + 3.3.0-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 b7ff8b23c2b4..b8fa13227fe7 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.3.0-rc5 + 3.3.0-SNAPSHOT war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index f7d33ab0d472..78b286b556b7 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.3.0-rc5" +GERRIT_VERSION = "3.3.0-SNAPSHOT"