Merge "Merge branch 'stable-2.13'"
diff --git a/ReleaseNotes/ReleaseNotes-2.13.txt b/ReleaseNotes/ReleaseNotes-2.13.txt
index df0e2cb..25e730e 100644
--- a/ReleaseNotes/ReleaseNotes-2.13.txt
+++ b/ReleaseNotes/ReleaseNotes-2.13.txt
@@ -295,6 +295,10 @@
=== Misc
+* New link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.13/access-control.html#category_add_patch_set[
+Add Patch Set capability] to control who is allowed to upload a new patch
+set to an existing change.
+
* link:https://bugs.chromium.org/p/gerrit/issues/detail?id=4015[Issue 4015]:
Allow setting a comment message when uploading a change.
@@ -392,7 +396,7 @@
* Upgrade Guice to 4.1.0
-* Upgrade gwtjsonrpc to 1.8
+* Upgrade gwtjsonrpc to 1.9
* Upgrade gwtorm to 1.15
@@ -400,7 +404,7 @@
* Upgrade Jetty to 9.2.14.v20151106
-* Upgrade JGit to 4.4.1.201607150455-r.137-gdd2a5a7
+* Upgrade JGit to 4.4.1.201607150455-r.144-gb67df51
* Upgrade joda-convert to 1.8.1
diff --git a/lib/BUCK b/lib/BUCK
index 4534b44..4a799f2 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -52,9 +52,9 @@
maven_jar(
name = 'gwtjsonrpc',
- id = 'com.google.gerrit:gwtjsonrpc:1.8',
- bin_sha1 = 'c264bf2f543cffddceada5cdf031eea06dbd44a0',
- src_sha1 = 'cab9117b6349c04c9fdcb5b31434b3a20fd36062',
+ id = 'com.google.gerrit:gwtjsonrpc:1.9',
+ bin_sha1 = '458f55e92584fbd9ab91a89fa1c37654922a0f2b',
+ src_sha1 = 'ba539361c80a26f0d30a2f56068f6d83f44062d8',
license = 'Apache2.0',
)
diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION
index 5964a28..c7f1056 100644
--- a/lib/JGIT_VERSION
+++ b/lib/JGIT_VERSION
@@ -1,4 +1,4 @@
include_defs('//lib/maven.defs')
REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL.
-VERS = '4.4.1.201607150455-r.137-gdd2a5a7'
+VERS = '4.4.1.201607150455-r.144-gb67df51'
diff --git a/lib/jgit/org.eclipse.jgit.archive/BUCK b/lib/jgit/org.eclipse.jgit.archive/BUCK
index 16d6cda..4a60b16 100644
--- a/lib/jgit/org.eclipse.jgit.archive/BUCK
+++ b/lib/jgit/org.eclipse.jgit.archive/BUCK
@@ -4,7 +4,7 @@
maven_jar(
name = 'jgit-archive',
id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS,
- sha1 = 'a23774dc4a9e4fd7177768c61cecccd80be2434e',
+ sha1 = 'abaee87ff5d85ff0f32de5e56669063b73e5fae0',
license = 'jgit',
repository = REPO,
deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUCK b/lib/jgit/org.eclipse.jgit.http.server/BUCK
index 2582cc3..2b5ad6e 100644
--- a/lib/jgit/org.eclipse.jgit.http.server/BUCK
+++ b/lib/jgit/org.eclipse.jgit.http.server/BUCK
@@ -4,7 +4,7 @@
maven_jar(
name = 'jgit-servlet',
id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS,
- sha1 = '0ec3fc4d662b23791a30a75823d429ac2b2e0034',
+ sha1 = 'a48e93266eb4a7a04a1767d6a16d2f0acf11402a',
license = 'jgit',
repository = REPO,
deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
diff --git a/lib/jgit/org.eclipse.jgit.junit/BUCK b/lib/jgit/org.eclipse.jgit.junit/BUCK
index 171e637..09b072e 100644
--- a/lib/jgit/org.eclipse.jgit.junit/BUCK
+++ b/lib/jgit/org.eclipse.jgit.junit/BUCK
@@ -4,7 +4,7 @@
maven_jar(
name = 'junit',
id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS,
- sha1 = '58886c1798248993021ac0db2624e09366281298',
+ sha1 = 'ccd60b0f344e98af051449c52542a18576cf69ba',
license = 'DO_NOT_DISTRIBUTE',
repository = REPO,
unsign = True,
diff --git a/lib/jgit/org.eclipse.jgit/BUCK b/lib/jgit/org.eclipse.jgit/BUCK
index eb9d80f..3cc27f7 100644
--- a/lib/jgit/org.eclipse.jgit/BUCK
+++ b/lib/jgit/org.eclipse.jgit/BUCK
@@ -4,8 +4,8 @@
maven_jar(
name = 'jgit',
id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS,
- bin_sha1 = 'cbb405a0d72d4f6086e1cdc4eca6121b3d6b41c1',
- src_sha1 = '3313d555e91177cb0f9c662aa3a5558a711bce8c',
+ bin_sha1 = 'b28b6e0d14adfcf0a3afcf4002fe16dc2cc3e453',
+ src_sha1 = '362c6913beb90a278c5cd479f7536813fe007b60',
license = 'jgit',
repository = REPO,
unsign = True,
