From a3bed28ef7c31647900cd716f5fcde184d55d1d5 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 30 Apr 2014 00:48:28 +0200 Subject: [PATCH 01/11] Buck: Strip SNAPSHOT suffix in artifact names only for GERRIT repositories Maven artifact names on Google bucket replacing SNAPSHOT suffix with timestamp. 731967591ef98ab3c94691ba9dc0f217630dda76 changed this by preserving the SNAPSHOT suffix. This broke fetching of gwtorm and gwtjsonrpc and was reverted by 731967591ef98ab3c94691ba9dc0f217630dda76. This change fixes this for both worlds: stripping it for GERRIT and GERRIT_API Maven repositories but preserving it for the rest. Test plan: maven_jar() is working as expected for the both worlds: * gwtorm:gwtorm:1.10-SNAPSHOT-20140310.015132-1 (repo = GERRIT) * org.eclipse.jgit:org.eclipse.jgit:3.4.0-SNAPSHOT (repo = MAVEN_LOCAL) Change-Id: I5357abe9ad6a40538c444ad70016c8c6d75d8ff3 --- lib/maven.defs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/maven.defs b/lib/maven.defs index a696580e72..9578c2b210 100644 --- a/lib/maven.defs +++ b/lib/maven.defs @@ -47,11 +47,17 @@ def maven_jar( raise NameError('expected id="groupId:artifactId:version"') group, artifact, version = parts - jar = path.join(name, artifact.lower() + '-' + version) + if 'SNAPSHOT' in version and repository.startswith(GERRIT): + file_version = version.replace('-SNAPSHOT', '') + version = version.split('-SNAPSHOT')[0] + '-SNAPSHOT' + else: + file_version = version + + jar = path.join(name, artifact.lower() + '-' + file_version) url = '/'.join([ repository, group.replace('.', '/'), artifact, version, - artifact + '-' + version]) + artifact + '-' + file_version]) binjar = jar + '.jar' binurl = url + '.jar' From 45946f19ceccebaff239a9f0d1d399cfc8bd9b47 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 30 Jun 2014 22:38:29 +0900 Subject: [PATCH 02/11] Update gwtorm to 1.7.1 Change-Id: Ia9ba26bdda20a053bc3a267c5c9efad37e76ab77 --- lib/BUCK | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/BUCK b/lib/BUCK index c9549b32de..6484dc1716 100644 --- a/lib/BUCK +++ b/lib/BUCK @@ -24,9 +24,9 @@ define_license(name = 'DO_NOT_DISTRIBUTE') maven_jar( name = 'gwtorm', - id = 'gwtorm:gwtorm:1.7', - bin_sha1 = 'ee3b316a023f1422dd4b6654a3d51d0e5690809c', - src_sha1 = 'a145bde4cc87a4ff4cec283880e2a03be32cc868', + id = 'gwtorm:gwtorm:1.7.1', + bin_sha1 = '1e56f2be88b6eb9bd90f515b87d8cf2f1812a317', + src_sha1 = '1b8a3235295b8597b3e5383827f39201bc73ceef', license = 'Apache2.0', deps = [':protobuf'], repository = GERRIT, From 4488bd68576074dda47ba1c60e9faa06650478ae Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 1 Jul 2014 00:44:51 +0200 Subject: [PATCH 03/11] Expose Atlassian's maven repository Change-Id: Ie6c8ff50f4ed6460aa7cbdea707d97fdd1f86a40 --- lib/maven.defs | 1 + tools/download_file.py | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maven.defs b/lib/maven.defs index 9578c2b210..67c7704f41 100644 --- a/lib/maven.defs +++ b/lib/maven.defs @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +ATLASSIAN = 'ATLASSIAN:' GERRIT = 'GERRIT:' ECLIPSE = 'ECLIPSE:' MAVEN_CENTRAL = 'MAVEN_CENTRAL:' diff --git a/tools/download_file.py b/tools/download_file.py index 8d76a40ea9..a65ee08bae 100755 --- a/tools/download_file.py +++ b/tools/download_file.py @@ -24,6 +24,7 @@ from sys import stderr from zipfile import ZipFile, BadZipfile, LargeZipFile REPO_ROOTS = { + 'ATLASSIAN': 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty', 'GERRIT': 'http://gerrit-maven.storage.googleapis.com', 'ECLIPSE': 'https://repo.eclipse.org/content/groups/releases', 'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2', From f69698ce9b9f4e9a68972e70c8d0102c8b12e291 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 1 Jul 2014 00:45:25 +0200 Subject: [PATCH 04/11] Update SSHD to 0.11.1-atlassian-1 Use custom build of SSHD library from Atlassian's maven repository, that fixes sporadic handshake failures [1]. [1] https://issues.apache.org/jira/browse/SSHD-330 Change-Id: I4258f515ac10e04c8c8f1850f060b9dbad6d876f --- lib/mina/BUCK | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/mina/BUCK b/lib/mina/BUCK index 95e476100f..fac2ba46d4 100644 --- a/lib/mina/BUCK +++ b/lib/mina/BUCK @@ -8,11 +8,12 @@ EXCLUDE = [ maven_jar( name = 'sshd', - id = 'org.apache.sshd:sshd-core:0.11.0', - sha1 = '450da44553c98805ca6bb5709cad54df4acb802a', + id = 'org.apache.sshd:sshd-core:0.11.1-atlassian-1', + sha1 = '0de20bfa03ddeedc8eb54ab6e85e90e776ea18f8', license = 'Apache2.0', deps = [':core'], exclude = EXCLUDE, + repository = ATLASSIAN, ) maven_jar( From 7ec90c9b4e4591c5a136519546d5374320bd8191 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Tue, 1 Jul 2014 01:14:50 +0200 Subject: [PATCH 05/11] Update 2.8.6 release notes with recent fixes Change-Id: I58376c245026e3f940703c986bd8c5789cb9ed3b --- ReleaseNotes/ReleaseNotes-2.8.6.txt | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes/ReleaseNotes-2.8.6.txt b/ReleaseNotes/ReleaseNotes-2.8.6.txt index 5bcade1222..3a132e411a 100644 --- a/ReleaseNotes/ReleaseNotes-2.8.6.txt +++ b/ReleaseNotes/ReleaseNotes-2.8.6.txt @@ -7,6 +7,8 @@ Download: link:https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.war[ https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.war] +*Warning*: Support for MySQL's MyISAM storage engine is discontinued. +Only transactional storage engines are supported. Bug Fixes --------- @@ -14,10 +16,32 @@ Bug Fixes * link:https://code.google.com/p/gerrit/issues/detail?id=2034[Issue 2034], link:https://code.google.com/p/gerrit/issues/detail?id=2383[Issue 2383], link:https://code.google.com/p/gerrit/issues/detail?id=2702[Issue 2702]: -Fix race condition in change merge queue. +Fix race condition in change merge queue when using Cherry-Pick submit +strategy. + There was a race in the merge queue between changes submitted via the UI, and merges scheduled by the background merge queue reload. + This resulted in multiple submit actions being scheduled, leading to corrupt changes. ++ +Execute cherry-pick submit DML operations in a database transaction +boundaries. In combination with implemented transaction management +for Jdbc dialects it solves the problem recovering from collisions +between interactive actions and background jobs. + +* In gwtorm the LIMIT clause was only honored when followed by a +constant integer. ++ +When followed by a placeholder "?" it wasn't included in the generated database +query. This caused poor performance when moving to the next change page for very +big projects. + +* Fix sporadic SSHD handshake failures +(link:https://issues.apache.org/jira/browse/SSHD-330[SSHD-330]). + +Updates +------- + +* gwtorm is updated to 1.7.1 +* sshd is updated to 0.11.1-atlassian-1 From caf5125b2c7fde6931a2122043b76ea34fcb8a2f Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Thu, 3 Jul 2014 15:33:39 +0200 Subject: [PATCH 06/11] Avoid avatar URL requests on load of change list The change list is showing avatars for the change owners. Until commit f712cdb27c74d8e19f19e3c15c9bbc32069187d2 this never worked since for the change list the avatar images are requested with size 16px and displaying of avatar images only worked for the default size which is 26px. Commit f712cdb27c74d8e19f19e3c15c9bbc32069187d2 fixed this so that the avatar URLs for non-default sizes are fetched from the server (because only the URL for the default size is contained in account info). As result we have now one avatar URL request per result in the change list which is too much load. Fix this by requesting the avatar with the default size (26px) and then scale it down in the browser to the needed size (16px). This is the same what we are already doing in other places where we want to display smaller avatars. Change-Id: I0df01a1b9c8e0c0332386e471bfe2eb1a94e7889 Signed-off-by: Edwin Kempin --- gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css | 2 ++ .../main/java/com/google/gerrit/client/ui/AccountLinkPanel.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css index 77daccfdf5..6a507feb51 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css @@ -96,6 +96,8 @@ a:hover { margin-right: 0.2em; position: relative; top: 2px; + height: 16px !important; + width: 16px; } .accountLinkPanel a { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountLinkPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountLinkPanel.java index 7f11df7e35..b883594e3a 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountLinkPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/AccountLinkPanel.java @@ -61,7 +61,7 @@ public class AccountLinkPanel extends FlowPanel { }; l.setTitle(FormatUtil.nameEmail(info)); - add(new AvatarImage(info, 16)); + add(new AvatarImage(info)); add(l); } From 4053b2131906682d3c266e257bf19e5ca59673b2 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Tue, 8 Jul 2014 08:54:24 +0200 Subject: [PATCH 07/11] Fix reference to Forge Committer access right in documentation The access right '+2 Forge Committer or Tagger Identity' in the 'Forge Identity' category doesn't exist anymore, but was replaced by the 'Forge Committer' access right. Change-Id: I786579407939b66ec886645fd687220e21ccb04d Signed-off-by: Edwin Kempin --- Documentation/error-invalid-committer.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/error-invalid-committer.txt b/Documentation/error-invalid-committer.txt index 0e4848006a..a6690105d2 100644 --- a/Documentation/error-invalid-committer.txt +++ b/Documentation/error-invalid-committer.txt @@ -95,9 +95,9 @@ If pushing to Gerrit fails with the error message "invalid committer" and somebody else committed the change for which the push fails, then you have no permissions to forge the committer identity. In this case you may contact the project owner to request -the access right '+2 Forge Committer or Tagger Identity' in the -'Forge Identity' category or ask the maintainer to commit this change -on the author's behalf. +the link:access-control.html#category_forge_committer['Forge Committer'] +access right or ask the maintainer to commit this change on the author's +behalf. GERRIT From c3c4115986679867716a3c74ab578c361588aee5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 2 Jul 2014 15:24:58 +0900 Subject: [PATCH 08/11] Upgrade gwtorm to 1.7.3 Fixes regressions introduced in 1.7.1 and 1.7.2 Change-Id: If288b3a1e17715e9e511aed1869d1ad32b80444c --- lib/BUCK | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/BUCK b/lib/BUCK index 6484dc1716..8f63a68903 100644 --- a/lib/BUCK +++ b/lib/BUCK @@ -24,9 +24,9 @@ define_license(name = 'DO_NOT_DISTRIBUTE') maven_jar( name = 'gwtorm', - id = 'gwtorm:gwtorm:1.7.1', - bin_sha1 = '1e56f2be88b6eb9bd90f515b87d8cf2f1812a317', - src_sha1 = '1b8a3235295b8597b3e5383827f39201bc73ceef', + id = 'gwtorm:gwtorm:1.7.3', + bin_sha1 = 'd3a088f0f25bec4857b086cdd9e60eab858ea973', + src_sha1 = 'd766b31bd9eb4e34b320500b425eca53bdd6963a', license = 'Apache2.0', deps = [':protobuf'], repository = GERRIT, From 586e7f706836ad7566b09148d489d114522650c2 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 2 Jul 2014 15:43:08 +0900 Subject: [PATCH 09/11] Update version to 2.8.6.1 Change-Id: I8669d1b25ea3b2b1e3449f449b88427193cbe822 --- VERSION | 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index ac95dd86e5..455dbd90f8 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.8.6' +GERRIT_VERSION = '2.8.6.1' diff --git a/gerrit-plugin-archetype/pom.xml b/gerrit-plugin-archetype/pom.xml index 4eec8a7033..1dcf21505f 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.8.6 + 2.8.6.1 Gerrit Code Review - Plugin Archetype diff --git a/gerrit-plugin-gwt-archetype/pom.xml b/gerrit-plugin-gwt-archetype/pom.xml index cc3c6e8f9c..895f9d4525 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.8.6 + 2.8.6.1 Gerrit Code Review - Web Ui GWT Plugin Archetype diff --git a/gerrit-plugin-gwtui/pom.xml b/gerrit-plugin-gwtui/pom.xml index 1b2bde1607..e01a409e5c 100644 --- a/gerrit-plugin-gwtui/pom.xml +++ b/gerrit-plugin-gwtui/pom.xml @@ -21,7 +21,7 @@ limitations under the License. com.google.gerrit gerrit-plugin-gwtui - 2.8.6 + 2.8.6.1 Gerrit Code Review - Plugin GWT UI diff --git a/gerrit-plugin-js-archetype/pom.xml b/gerrit-plugin-js-archetype/pom.xml index 522c6d0fab..68b360f860 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.8.6 + 2.8.6.1 Gerrit Code Review - Web UI JavaScript Plugin Archetype From e5c2acb6aeb84b5ff444553596320b25efc54bb2 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 4 Jul 2014 10:12:43 +0900 Subject: [PATCH 10/11] Remove reference to MyISAM from database setup documentation From 2.8.6 only transactional databases are supported. Change-Id: Ie0d94c40a371dd018b897113eca8b745a1000d2e --- Documentation/database-setup.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Documentation/database-setup.txt b/Documentation/database-setup.txt index 2016ac3363..b41911ab77 100644 --- a/Documentation/database-setup.txt +++ b/Documentation/database-setup.txt @@ -60,14 +60,6 @@ rights on it: FLUSH PRIVILEGES; ---- -If you are using the MyISAM engine, you need to set latin1 as charset: - ----- - mysql - - ALTER DATABASE reviewdb charset=latin1; ----- - Visit MySQL's link:http://dev.mysql.com/doc/[documentation] for further information regarding using MySQL. From c471c44be5976e18897787bd2f568be635c7f1e6 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 2 Jul 2014 15:47:33 +0900 Subject: [PATCH 11/11] Release notes for Gerrit 2.8.6.1 Change-Id: I625ac1ad8b84e81902d4c936c214ff242098de2f --- ReleaseNotes/ReleaseNotes-2.8.6.1.txt | 23 +++++++++++++++++++++++ ReleaseNotes/index.txt | 1 + 2 files changed, 24 insertions(+) create mode 100644 ReleaseNotes/ReleaseNotes-2.8.6.1.txt diff --git a/ReleaseNotes/ReleaseNotes-2.8.6.1.txt b/ReleaseNotes/ReleaseNotes-2.8.6.1.txt new file mode 100644 index 0000000000..2783ec6f80 --- /dev/null +++ b/ReleaseNotes/ReleaseNotes-2.8.6.1.txt @@ -0,0 +1,23 @@ +Release notes for Gerrit 2.8.6.1 +================================ + +There are no schema changes from link:ReleaseNotes-2.8.6.html[2.8.6]. + +Download: +link:https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.1.war[ +https://gerrit-releases.storage.googleapis.com/gerrit-2.8.6.1.war] + +Bug Fixes +--------- + +* The fix in 2.8.6 for the merge queue race condition caused a regression +in database transaction handling. + +* The fix in 2.8.6 for the LIMIT clause caused a regression in Oracle +database support. + + +Updates +------- + +* gwtorm is updated to 1.7.3 diff --git a/ReleaseNotes/index.txt b/ReleaseNotes/index.txt index 368d15336d..79316811a2 100644 --- a/ReleaseNotes/index.txt +++ b/ReleaseNotes/index.txt @@ -4,6 +4,7 @@ Gerrit Code Review - Release Notes [[2_8]] Version 2.8.x ------------- +* link:ReleaseNotes-2.8.6.1.html[2.8.6.1] * link:ReleaseNotes-2.8.6.html[2.8.6] * link:ReleaseNotes-2.8.5.html[2.8.5] * link:ReleaseNotes-2.8.4.html[2.8.4]