From 5db88b956c2844e77fa174ab0750a32be66a0680 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 9 Mar 2016 12:09:42 +0900 Subject: [PATCH 1/2] Release notes for 2.12.2 Change-Id: I1b39db6597c53d66c4a8fb39e15bc72698b12003 --- ReleaseNotes/ReleaseNotes-2.12.2.txt | 38 ++++++++++++++++++++++++++++ ReleaseNotes/index.txt | 1 + 2 files changed, 39 insertions(+) create mode 100644 ReleaseNotes/ReleaseNotes-2.12.2.txt diff --git a/ReleaseNotes/ReleaseNotes-2.12.2.txt b/ReleaseNotes/ReleaseNotes-2.12.2.txt new file mode 100644 index 0000000000..5582bf90d9 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes-2.12.2.txt @@ -0,0 +1,38 @@ +Release notes for Gerrit 2.12.2 +=============================== + +Gerrit 2.12.2 is now available: + +link:https://gerrit-releases.storage.googleapis.com/gerrit-2.12.2.war[ +https://gerrit-releases.storage.googleapis.com/gerrit-2.12.2.war] + +There are no schema changes from link:ReleaseNotes-2.12.1.html[2.12.1]. + +Bug Fixes +--------- + +* Upgrade Apache commons-collections to version 3.2.2. ++ +Includes a fix for a link:https://issues.apache.org/jira/browse/COLLECTIONS-580[ +remote code execution exploit]. + +* link:https://code.google.com/p/gerrit/issues/detail?id=3919[Issue 3919]: +Explicitly set parent project to 'All-Projects' when a project is created +without giving the parent. + +* Don't add message twice on abandon or restore via ssh review command. ++ +When abandoning or reviewing a change via the ssh `review` command, and +providing a message with the `--message` option, the message was added to +the change twice. + +* Clear the input box after cancelling add reviewer action. ++ +When the action was cancelled, the content of the input box was still +there when opening it again. + +* Fix internal server error when aborting ssh command. + +* link:https://code.google.com/p/gerrit/issues/detail?id=3969[Issue 3969]: +Fix internal server error when submitting a change with 'Rebase If Necessary' +strategy. diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt index 3d4a627e48..42e75858cf 100644 --- a/ReleaseNotes/index.txt +++ b/ReleaseNotes/index.txt @@ -4,6 +4,7 @@ Gerrit Code Review - Release Notes [[2_12]] Version 2.12.x -------------- +* link:ReleaseNotes-2.12.2.html[2.12.2] * link:ReleaseNotes-2.12.1.html[2.12.1] * link:ReleaseNotes-2.12.html[2.12] From f4106227e4fe4d494bb6ec43c5410f0d2f8fb150 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 9 Mar 2016 12:10:03 +0900 Subject: [PATCH 2/2] Set version to 2.12.2 Change-Id: I2c829d1edfd39187554738a7f593feb1675e8d01 --- 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 f1400c29be..fac9f01990 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.12.1 \ + -DarchetypeVersion=2.12.2 \ -DgroupId=com.googlesource.gerrit.plugins.testplugin \ -DartifactId=testplugin ---- diff --git a/VERSION b/VERSION index 841acd0130..4d167fc5ee 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.12.1' +GERRIT_VERSION = '2.12.2' diff --git a/gerrit-acceptance-framework/pom.xml b/gerrit-acceptance-framework/pom.xml index 4a595f4c02..fedb649681 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.12.1 + 2.12.2 jar Gerrit Code Review - Acceptance Test Framework API for Gerrit Plugins diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml index 872bc9f678..532acc9d6d 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.12.1 + 2.12.2 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 77ce7265e9..764a7d40d1 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.12.1 + 2.12.2 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 8d9c1b8960..4208fdf17b 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.12.1 + 2.12.2 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 3961bd7829..e29f7b89a0 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.12.1 + 2.12.2 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 31bab732d5..c8f842cb0e 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.12.1 + 2.12.2 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 0820c42ba7..dcd28416f8 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.12.1 + 2.12.2 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 d09519213a..8b5e2e364b 100644 --- a/gerrit-war/pom.xml +++ b/gerrit-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.google.gerrit gerrit-war - 2.12.1 + 2.12.2 war Gerrit Code Review - WAR Gerrit WAR