From 84abbf6e30ffd97de70db8cb2133a2036388ff06 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Mon, 28 Apr 2014 09:10:34 +0200 Subject: [PATCH 1/4] No pom.xml in gerrit-plugin-gwtui to update 9a13f852f04b956f1d8b51526732d187258ef58b add utility script to update pom.xml with newest version. gerrit-plugin-gwtui project doesn't have pom.xml and must not be updated. Change-Id: If2d367e8b8c0a5c4960bfc0a059b42cf951e7462 (cherry picked from commit c092bc24fefce072079ea8af58ef7f5c35236c67) --- tools/version.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/version.py b/tools/version.py index 60489c8751..cb7274dcc5 100755 --- a/tools/version.py +++ b/tools/version.py @@ -30,8 +30,9 @@ elif len(args) > 1: new_version = args[0] pattern = re.compile(r'(\s*)[-.\w]+') -for project in ['gerrit-plugin-archetype', 'gerrit-plugin-gwt-archetype', - 'gerrit-plugin-gwtui', 'gerrit-plugin-js-archetype']: +for project in ['gerrit-plugin-archetype', + 'gerrit-plugin-gwt-archetype', + 'gerrit-plugin-js-archetype']: pom = os.path.join(project, 'pom.xml') try: outxml = "" From 6ef9350077d6ed1e269252aae7dba4aa411af6cd Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Wed, 21 May 2014 13:15:08 +0200 Subject: [PATCH 2/4] Add more bug-fixes to 2.9 release notes Change-Id: Id06c973c12112bf0e6e8e3b9e8e36a387253c2f6 Signed-off-by: Edwin Kempin --- ReleaseNotes/ReleaseNotes-2.9.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ReleaseNotes/ReleaseNotes-2.9.txt b/ReleaseNotes/ReleaseNotes-2.9.txt index 2a249adbd1..c3ae9a0624 100644 --- a/ReleaseNotes/ReleaseNotes-2.9.txt +++ b/ReleaseNotes/ReleaseNotes-2.9.txt @@ -486,6 +486,17 @@ Web UI * link:http://code.google.com/p/gerrit/issues/detail?id=2652[Issue 2652]: Copy label approvals when cherry-picking change to same branch. +* link:http://code.google.com/p/gerrit/issues/detail?id=2662[Issue 2662]: +Limit file list in new change screen to files that were touched in new +patch set. + +* link:http://code.google.com/p/gerrit/issues/detail?id=2308[Issue 2308]: +Show related changes in new change screen for merged changes if there +are open descendants. + +* link:http://code.google.com/p/gerrit/issues/detail?id=2635[Issue 2635]: +Fix copying of download commands by 'Cmd-C' in Safari. + * link:http://code.google.com/p/gerrit/issues/detail?id=2178[Issue 2178]: Fix background of reply box on new change screen getting transparent. @@ -511,6 +522,14 @@ side-by-side diff screen. * link:http://code.google.com/p/gerrit/issues/detail?id=2340[Issue 2340]: Fix selection in new side-by-side diff screen. +* link:http://code.google.com/p/gerrit/issues/detail?id=2409[Issue 2409]: +Show in new side-by-side diff screen updates of submodule links. + +* link:http://code.google.com/p/gerrit/issues/detail?id=2481[Issue 2481]: +After showing a binary file in the unified diff screen switch back to +the side-by-side diff screen when the user navigates to the +next/previous file. + * link:http://code.google.com/p/gerrit/issues/detail?id=2417[Issue 2417]: Respect base diff revision for files REST call. From c7ddc2c0d18cfebe84ca9c9bb5187b01392164ba Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Wed, 21 May 2014 11:12:35 +0200 Subject: [PATCH 3/4] Add pom with meta-data for plugin projects These pom files are needed to be able to upload the plugin artifacts to Maven Central. Change-Id: I7c812538a4c2ddf684c0b6696fb7efc0a42002e4 Signed-off-by: Edwin Kempin --- gerrit-extension-api/pom.xml | 59 ++++++++++++++++++++++++++++++++++++ gerrit-plugin-api/pom.xml | 59 ++++++++++++++++++++++++++++++++++++ gerrit-plugin-gwtui/pom.xml | 59 ++++++++++++++++++++++++++++++++++++ tools/version.py | 6 ++-- 4 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 gerrit-extension-api/pom.xml create mode 100644 gerrit-plugin-api/pom.xml create mode 100644 gerrit-plugin-gwtui/pom.xml diff --git a/gerrit-extension-api/pom.xml b/gerrit-extension-api/pom.xml new file mode 100644 index 0000000000..1b15746829 --- /dev/null +++ b/gerrit-extension-api/pom.xml @@ -0,0 +1,59 @@ + + 4.0.0 + com.google.gerrit + gerrit-extension-api + 2.9-SNAPSHOT + jar + Gerrit Code Review - Extension API + API for Gerrit Extensions + http://code.google.com/p/gerrit/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://gerrit.googlesource.com/gerrit + https://gerrit.googlesource.com/gerrit + + + + + Dave Borowitz + + + David Pursehouse + + + Edwin Kempin + + + Martin Fick + + + Saša Živkov + + + Shawn Pearce + + + + + + Repo and Gerrit Discussion + repo-discuss@googlegroups.com + https://groups.google.com/forum/#!forum/repo-discuss + https://groups.google.com/forum/#!forum/repo-discuss + https://groups.google.com/forum/#!forum/repo-discuss + + + + + http://code.google.com/p/gerrit/issues/list + Google Code Issue Tracker + + diff --git a/gerrit-plugin-api/pom.xml b/gerrit-plugin-api/pom.xml new file mode 100644 index 0000000000..5bd7f69433 --- /dev/null +++ b/gerrit-plugin-api/pom.xml @@ -0,0 +1,59 @@ + + 4.0.0 + com.google.gerrit + gerrit-plugin-api + 2.9-SNAPSHOT + jar + Gerrit Code Review - Plugin API + API for Gerrit Plugins + http://code.google.com/p/gerrit/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://gerrit.googlesource.com/gerrit + https://gerrit.googlesource.com/gerrit + + + + + Dave Borowitz + + + David Pursehouse + + + Edwin Kempin + + + Martin Fick + + + Saša Živkov + + + Shawn Pearce + + + + + + Repo and Gerrit Discussion + repo-discuss@googlegroups.com + https://groups.google.com/forum/#!forum/repo-discuss + https://groups.google.com/forum/#!forum/repo-discuss + https://groups.google.com/forum/#!forum/repo-discuss + + + + + http://code.google.com/p/gerrit/issues/list + Google Code Issue Tracker + + diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml new file mode 100644 index 0000000000..2064d74fcc --- /dev/null +++ b/gerrit-plugin-gwtui/pom.xml @@ -0,0 +1,59 @@ + + 4.0.0 + com.google.gerrit + gerrit-plugin-gwtui + 2.9-SNAPSHOT + jar + Gerrit Code Review - Plugin GWT UI + Common Classes for Gerrit GWT UI Plugins + http://code.google.com/p/gerrit/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://gerrit.googlesource.com/gerrit + https://gerrit.googlesource.com/gerrit + + + + + Dave Borowitz + + + David Pursehouse + + + Edwin Kempin + + + Martin Fick + + + Saša Živkov + + + Shawn Pearce + + + + + + Repo and Gerrit Discussion + repo-discuss@googlegroups.com + https://groups.google.com/forum/#!forum/repo-discuss + https://groups.google.com/forum/#!forum/repo-discuss + https://groups.google.com/forum/#!forum/repo-discuss + + + + + http://code.google.com/p/gerrit/issues/list + Google Code Issue Tracker + + diff --git a/tools/version.py b/tools/version.py index cb7274dcc5..92143bac6c 100755 --- a/tools/version.py +++ b/tools/version.py @@ -30,9 +30,9 @@ elif len(args) > 1: new_version = args[0] pattern = re.compile(r'(\s*)[-.\w]+') -for project in ['gerrit-plugin-archetype', - 'gerrit-plugin-gwt-archetype', - 'gerrit-plugin-js-archetype']: +for project in ['gerrit-extension-api', 'gerrit-plugin-api', + 'gerrit-plugin-archetype', 'gerrit-plugin-gwt-archetype', + 'gerrit-plugin-gwtui', 'gerrit-plugin-js-archetype']: pom = os.path.join(project, 'pom.xml') try: outxml = "" From ba0227cd88a3ea8e83a66f994ce03c45fdfb68c0 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 22 May 2014 20:04:45 +0200 Subject: [PATCH 4/4] Define mvn() function only once Change-Id: I97e3813b1145f35cc5daa232cbe1f0674f3f89fc --- tools/maven/mvn.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/maven/mvn.py b/tools/maven/mvn.py index 250e89f149..a4aaa5aba0 100644 --- a/tools/maven/mvn.py +++ b/tools/maven/mvn.py @@ -20,9 +20,6 @@ from os import path from sys import stderr from tools.util import check_output -def mvn(action): - return ['mvn', '--file', path.join(self, 'fake_pom_%s.xml' % action)] - def mvn(action): return ['mvn', '--file', path.join(self, 'fake_pom_%s.xml' % action)]