From 45182fea5507334437bee5cc1d1ed5b23e5b6ba2 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 19 Apr 2019 11:14:50 +0900 Subject: [PATCH 1/3] Set version to 2.13.14 Change-Id: I6cbf560c895c1b20a02d3a61ca66b3e9e7af6100 --- Documentation/dev-plugins.txt | 2 +- VERSION | 2 +- gerrit-acceptance-framework/pom.xml | 2 +- gerrit-extension-api/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-war/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt index c4c04ac0df..4d636cbb99 100644 --- a/Documentation/dev-plugins.txt +++ b/Documentation/dev-plugins.txt @@ -36,7 +36,7 @@ plugin project. ---- mvn archetype:generate -DarchetypeGroupId=com.google.gerrit \ -DarchetypeArtifactId=gerrit-plugin-archetype \ - -DarchetypeVersion=2.13.14-SNAPSHOT \ + -DarchetypeVersion=2.13.14 \ -DgroupId=com.googlesource.gerrit.plugins.testplugin \ -DartifactId=testplugin ---- diff --git a/VERSION b/VERSION index 9cfcfa799b..8bcf86b5e3 100644 --- a/VERSION +++ b/VERSION @@ -2,4 +2,4 @@ # Used by :api_install and :api_deploy targets # when talking to the destination repository. # -GERRIT_VERSION = '2.13.14-SNAPSHOT' +GERRIT_VERSION = '2.13.14' diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index 8d3dd38d26..4ba3720ef5 100644 --- a/gerrit-acceptance-framework/pom.xml +++ b/gerrit-acceptance-framework/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 2.13.14-SNAPSHOT + 2.13.14 jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index 13e96b1bcc..083e644862 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.13.14-SNAPSHOT + 2.13.14 jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index 8ce41aee61..02ada4a788 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.13.14-SNAPSHOT + 2.13.14 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/gerrit-plugin-archetype/pom.xml b/gerrit-plugin-archetype/pom.xml index ec5c9d5f79..59aa21a602 100644 --- a/gerrit-plugin-archetype/pom.xml +++ b/gerrit-plugin-archetype/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.gerrit gerrit-plugin-archetype - 2.13.14-SNAPSHOT + 2.13.14 Gerrit Code Review - Plugin Archetype Maven Archetype for Gerrit Plugins https://www.gerritcodereview.com/ diff --git a/gerrit-plugin-gwt-archetype/pom.xml b/gerrit-plugin-gwt-archetype/pom.xml index c9e95df9a0..28f2f8032a 100644 --- a/gerrit-plugin-gwt-archetype/pom.xml +++ b/gerrit-plugin-gwt-archetype/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.gerrit gerrit-plugin-gwt-archetype - 2.13.14-SNAPSHOT + 2.13.14 Gerrit Code Review - Web UI GWT Plugin Archetype Maven Archetype for Gerrit Web UI GWT Plugins https://www.gerritcodereview.com/ diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 59f70479e0..5c412fd200 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.13.14-SNAPSHOT + 2.13.14 jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/gerrit-plugin-js-archetype/pom.xml b/gerrit-plugin-js-archetype/pom.xml index 637ec8f768..de6e1d9076 100644 --- a/gerrit-plugin-js-archetype/pom.xml +++ b/gerrit-plugin-js-archetype/pom.xml @@ -20,7 +20,7 @@ limitations under the License. com.google.gerrit gerrit-plugin-js-archetype - 2.13.14-SNAPSHOT + 2.13.14 Gerrit Code Review - Web UI JavaScript Plugin Archetype Maven Archetype for Gerrit Web UI JavaScript Plugins https://www.gerritcodereview.com/ diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index 1936bc6506..a32669cf3b 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.13.14-SNAPSHOT + 2.13.14 war Gerrit Code Review - WAR Gerrit WAR From b73c0c7e1b76e36feb303e092d1f6afc1fa0bc6c Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 19 Apr 2019 13:15:45 +0900 Subject: [PATCH 2/3] Set version to 2.14.20 Change-Id: I1f5e98a5ed672e3a9c04ff82afd677282a663cb9 --- gerrit-acceptance-framework/pom.xml | 2 +- gerrit-extension-api/pom.xml | 2 +- gerrit-plugin-api/pom.xml | 2 +- gerrit-plugin-gwtui/pom.xml | 2 +- gerrit-war/pom.xml | 2 +- version.bzl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index 858d9173d8..b1ae2644fe 100644 --- a/gerrit-acceptance-framework/pom.xml +++ b/gerrit-acceptance-framework/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-acceptance-framework - 2.14.20-SNAPSHOT + 2.14.20 jar Gerrit Code Review - Acceptance Test Framework Framework for Gerrit's acceptance tests diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index d78151df10..4d156c68ca 100644 --- a/gerrit-extension-api/pom.xml +++ b/gerrit-extension-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-extension-api - 2.14.20-SNAPSHOT + 2.14.20 jar Gerrit Code Review - Extension API API for Gerrit Extensions diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml index c3473fc6ee..630fb6c16e 100644 --- a/gerrit-plugin-api/pom.xml +++ b/gerrit-plugin-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-api - 2.14.20-SNAPSHOT + 2.14.20 jar Gerrit Code Review - Plugin API API for Gerrit Plugins diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 2a12b41864..8da9000817 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-plugin-gwtui - 2.14.20-SNAPSHOT + 2.14.20 jar Gerrit Code Review - Plugin GWT UI Common Classes for Gerrit GWT UI Plugins diff --git a/gerrit-war/pom.xml b/gerrit-war/pom.xml index ef9c88a4de..b4f2ec1387 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.14.20-SNAPSHOT + 2.14.20 war Gerrit Code Review - WAR Gerrit WAR diff --git a/version.bzl b/version.bzl index 3c1b2af7db..d323cd4069 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.14.20-SNAPSHOT" +GERRIT_VERSION = "2.14.20" From 05bd48c6dd34fe2e93129b462ed9cc7cd42121c0 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 19 Apr 2019 13:58:21 +0900 Subject: [PATCH 3/3] cmd-review: Remove documentation of removed options The --delete and --publish options were removed when the draft workflow was discontinued. Bug: Issue 10736 Change-Id: Ibf25a6a5524a9638144d9da2c84b1c5b06686245 --- Documentation/cmd-review.txt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Documentation/cmd-review.txt b/Documentation/cmd-review.txt index 605fc1fe82..7ee7b8314a 100644 --- a/Documentation/cmd-review.txt +++ b/Documentation/cmd-review.txt @@ -15,9 +15,7 @@ _ssh_ -p _gerrit review_ [--abandon | --restore] [--rebase] [--move ] - [--publish] [--json | -j] - [--delete] [--verified ] [--code-review ] [--label Label-Name=] [--tag TAG] @@ -66,7 +64,7 @@ branch. Read review input json from stdin. See link:rest-api-changes.html#review-input[ReviewInput] entity for the format. - (option is mutually exclusive with --submit, --restore, --publish, --delete, + (option is mutually exclusive with --submit, --restore, --abandon, --message, --rebase and --move) --notify:: @@ -88,7 +86,7 @@ branch. --abandon:: Abandon the specified change(s). - (option is mutually exclusive with --submit, --restore, --publish, --delete, + (option is mutually exclusive with --submit, --restore, --rebase, --move and --json) --restore:: @@ -97,7 +95,7 @@ branch. --rebase:: Rebase the specified change(s). - (option is mutually exclusive with --abandon, --submit, --delete and --json) + (option is mutually exclusive with --abandon, --submit and --json) --move:: Move the specified change(s). @@ -106,7 +104,7 @@ branch. --submit:: -s:: Submit the specified patch set(s) for merging. - (option is mutually exclusive with --abandon, --publish --delete, --rebase + (option is mutually exclusive with --abandon, --rebase and --json) --code-review::