opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Set version to 2.15.14-SNAPSHOT
  Upgrade JGit to 5.1.7.201904200442-r
  Set version to 2.15.13
  SitePathInitializer: Add missing "AddKeyHtml.soy"
  Upgrade JGit to 4.9.10.201904181027-r
  Convert http links to https

Change-Id: I4033d3abcded7892e7a0e3c7e019a214c48cec7a
This commit is contained in:
David Pursehouse
2019-04-24 08:30:07 +09:00
parent ddbd50a766 4dab1bb1fd
commit 57fa2779ca
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/com/google/gerrit/pgm/init/SitePathInitializer.java
View File

@@ -107,6 +107,7 @@ public class SitePathInitializer {
extractMailExample("Abandoned.soy");
extractMailExample("AbandonedHtml.soy");
extractMailExample("AddKey.soy");
extractMailExample("AddKeyHtml.soy");
extractMailExample("ChangeFooter.soy");
extractMailExample("ChangeFooterHtml.soy");
extractMailExample("ChangeSubject.soy");

2
lib/jgit/jgit.bzl
View File

@@ -4,7 +4,7 @@ _JGIT_VERS = "5.2.1.201812262042-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot
JGIT_DOC_URL = "http://download.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
JGIT_DOC_URL = "https://download.eclipse.org/jgit/site/" + _DOC_VERS + "/apidocs"
_JGIT_REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL.

2
tools/bzl/javadoc.bzl
View File

@@ -23,7 +23,7 @@ def _impl(ctx):
transitive_jar_paths = [j.path for j in transitive_jars.to_list()]
dir = ctx.outputs.zip.path + ".dir"
source = ctx.outputs.zip.path + ".source"
external_docs = ["http://docs.oracle.com/javase/8/docs/api"] + ctx.attr.external_docs
external_docs = ["https://docs.oracle.com/javase/8/docs/api"] + ctx.attr.external_docs
cmd = [
"TZ=UTC",
"export TZ",

2
tools/js/npm_pack.py
View File

@@ -54,7 +54,7 @@ def main(args):
name, version = args
filename = '%s-%s.tgz' % (name, version)
url = 'http://registry.npmjs.org/%s/-/%s' % (name, filename)
url = 'https://registry.npmjs.org/%s/-/%s' % (name, filename)
tmpdir = tempfile.mkdtemp()
tgz = os.path.join(tmpdir, filename)

4
tools/util.py
View File

@@ -16,9 +16,9 @@ from os import path
REPO_ROOTS = {
'ECLIPSE': 'https://repo.eclipse.org/content/groups/releases',
'GERRIT': 'http://gerrit-maven.storage.googleapis.com',
'GERRIT': 'https://gerrit-maven.storage.googleapis.com',
'GERRIT_API': 'https://gerrit-api.commondatastorage.googleapis.com/release',
'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2',
'MAVEN_CENTRAL': 'https://repo1.maven.org/maven2',
'MAVEN_LOCAL': 'file://' + path.expanduser('~/.m2/repository'),
'MAVEN_SNAPSHOT': 'https://oss.sonatype.org/content/repositories/snapshots',
}

12
tools/util_test.py
View File

@@ -29,18 +29,18 @@ class TestResolveUrl(unittest.TestCase):
def testKnownRedirect(self):
url = resolve_url('MAVEN_CENTRAL:foo.jar',
{'MAVEN_CENTRAL': 'http://my.company.mirror/maven2'})
self.assertEqual(url, 'http://my.company.mirror/maven2/foo.jar')
{'MAVEN_CENTRAL': 'https://my.company.mirror/maven2'})
self.assertEqual(url, 'https://my.company.mirror/maven2/foo.jar')
def testCustom(self):
url = resolve_url('http://maven.example.com/release/foo.jar', {})
self.assertEqual(url, 'http://maven.example.com/release/foo.jar')
url = resolve_url('https://maven.example.com/release/foo.jar', {})
self.assertEqual(url, 'https://maven.example.com/release/foo.jar')
def testCustomRedirect(self):
url = resolve_url('MAVEN_EXAMPLE:foo.jar',
{'MAVEN_EXAMPLE':
'http://maven.example.com/release'})
self.assertEqual(url, 'http://maven.example.com/release/foo.jar')
'https://maven.example.com/release'})
self.assertEqual(url, 'https://maven.example.com/release/foo.jar')
if __name__ == '__main__':