Merge branch 'stable-2.13' * stable-2.13: Set version to 2.13 Update 2.13 release notes Upgrade JGit to version 4.5.0.201609210915-r Update 2.13 release notes Change-Id: I67abdbc477c4355a3e040a3ec37debdce109dc7b
diff --git a/ReleaseNotes/ReleaseNotes-2.13.txt b/ReleaseNotes/ReleaseNotes-2.13.txt index d73a1bd..b875603 100644 --- a/ReleaseNotes/ReleaseNotes-2.13.txt +++ b/ReleaseNotes/ReleaseNotes-2.13.txt
@@ -327,6 +327,18 @@ capability, or to ensure that specific groups always have administration capabilities. +* New configuration options to configure JGit repository cache parameters. ++ +link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.13/config-gerrit.html#core.repositoryCacheCleanupDelay[ +core.repositoryCacheCleanupDelay] and +link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.13/config-gerrit.html#core.repositoryCacheExpireAfter[ +core.repositoryCacheExpireAfter] can be configured. + +* Accept `-b` as an alias of `--batch` in the +link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.13/pgm-init.html[ +init program]. + + == Bug Fixes * Don't add the same SSH key multiple times. @@ -400,6 +412,22 @@ easier to track down which commit failed validation when multiple commits are pushed at the same time. +* Don't check mergeability of draft changes. ++ +Draft changes can be deleted but not abandoned so there is no way for +an administrator to get rid of the them on behalf of the users. This can +become a problem when there many draft changes because the mergeability +check can be costly. ++ +The mergeability check is no longer done for draft changes, but will be +done when the draft change is published. + +* Fix internal server error when plugin-provided file history weblink +is null. ++ +It is valid for a plugin to provide a null weblink, but doing so resulted +in an internal server error. + == Dependency updates * Add dependency on blame-cache 0.1-9 @@ -430,7 +458,7 @@ * Upgrade Jetty to 9.2.14.v20151106 -* Upgrade JGit to 4.4.1.201607150455-r.144-gb67df51 +* Upgrade JGit to 4.5.0.201609210915-r * Upgrade joda-convert to 1.8.1
diff --git a/lib/JGIT_VERSION b/lib/JGIT_VERSION index 5817fe8..b7f7c84 100644 --- a/lib/JGIT_VERSION +++ b/lib/JGIT_VERSION
@@ -1,6 +1,6 @@ include_defs('//lib/maven.defs') -REPO = GERRIT # Leave here even if set to MAVEN_CENTRAL. -VERS = '4.4.1.201607150455-r.148-gabeaafc' -DOC_VERS = '4.4.1.201607150455-r' # Set to VERS unless using a snapshot +REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL. +VERS = '4.5.0.201609210915-r' +DOC_VERS = VERS # Set to VERS unless using a snapshot JGIT_DOC_URL="http://download.eclipse.org/jgit/site/" + DOC_VERS + "/apidocs"
diff --git a/lib/jgit/org.eclipse.jgit.archive/BUCK b/lib/jgit/org.eclipse.jgit.archive/BUCK index af0284f..7c967b3 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 = '73c3dd7d57c54b4ec95db6325e2d51dd3a0e6036', + sha1 = '2db2e7666672a31fa41b7e1dadcba51df6d30954', 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 c93ea99..06865cb 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 = 'a85e11f0f31f71a4e4e83313c4c24167e99d330c', + sha1 = '6e36638888918d9941dddec7e2abe1f162cc74d9', 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 9d4a2dd..77b637a 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 = 'cd7e83bb138d0c3dad9d2dea27c238824d056a4b', + sha1 = 'e8fb1d81f588c3174a9730bdecdbde9faa04140a', 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 da1ad9a..458703c 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 = '0bbcd8846f2731e50fccfb9f3ced43e2298844d4', - src_sha1 = '72d8aa79f8e645bb44f9f2fe74d02c6021516261', + bin_sha1 = '3e3d0b73dcf4ad649f37758ea8502d92f3d299de', + src_sha1 = 'fc352952db91a4046e4b832145eb2dc8afce8db1', license = 'jgit', repository = REPO, unsign = True,