From a3bed28ef7c31647900cd716f5fcde184d55d1d5 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Wed, 30 Apr 2014 00:48:28 +0200 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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