Merge branch 'stable-2.8' into stable-2.9
* stable-2.8: Update 2.8.6 release notes with recent fixes Update SSHD to 0.11.1-atlassian-1 Expose Atlassian's maven repository Update gwtorm to 1.7.1 Buck: Strip SNAPSHOT suffix in artifact names only for GERRIT repositories Conflicts: lib/BUCK tools/download_file.py Change-Id: Ia315d2da7a884f8466b461234183d78ef833675f
This commit is contained in:
commit
519e127c4d
@ -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
|
||||
|
@ -12,6 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
ATLASSIAN = 'ATLASSIAN:'
|
||||
GERRIT = 'GERRIT:'
|
||||
GERRIT_API = 'GERRIT_API:'
|
||||
ECLIPSE = 'ECLIPSE:'
|
||||
@ -48,11 +49,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'
|
||||
|
@ -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(
|
||||
|
@ -22,6 +22,7 @@ except ImportError:
|
||||
return Popen(*cmd, stdout=PIPE).communicate()[0]
|
||||
|
||||
REPO_ROOTS = {
|
||||
'ATLASSIAN': 'https://maven.atlassian.com/content/repositories/atlassian-3rdparty',
|
||||
'GERRIT': 'http://gerrit-maven.storage.googleapis.com',
|
||||
'GERRIT_API': 'https://gerrit-api.commondatastorage.googleapis.com/release',
|
||||
'ECLIPSE': 'https://repo.eclipse.org/content/groups/releases',
|
||||
|
Loading…
Reference in New Issue
Block a user