opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Set version to 2.15.14-SNAPSHOT
  Convert http links to https

Change-Id: Ib427688f1d09de6747fe198ea402bf708e937889
This commit is contained in:
David Pursehouse 2019-04-23 19:41:20 +09:00
commit 4dab1bb1fd
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jgit/jgit.bzl
View File

@ -4,7 +4,7 @@ _JGIT_VERS = "5.1.7.201904200442-r"
_DOC_VERS = _JGIT_VERS # Set to _JGIT_VERS unless using a snapshot _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. _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()] transitive_jar_paths = [j.path for j in transitive_jars.to_list()]
dir = ctx.outputs.zip.path + ".dir" dir = ctx.outputs.zip.path + ".dir"
source = ctx.outputs.zip.path + ".source" 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 = [ cmd = [
"TZ=UTC", "TZ=UTC",
"export TZ", "export TZ",

2
tools/js/npm_pack.py
View File

@ -54,7 +54,7 @@ def main(args):
name, version = args name, version = args
filename = '%s-%s.tgz' % (name, version) 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() tmpdir = tempfile.mkdtemp()
tgz = os.path.join(tmpdir, filename) tgz = os.path.join(tmpdir, filename)

4
tools/util.py
View File

@ -16,9 +16,9 @@ from os import path
REPO_ROOTS = { REPO_ROOTS = {
'ECLIPSE': 'https://repo.eclipse.org/content/groups/releases', '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', '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_LOCAL': 'file://' + path.expanduser('~/.m2/repository'),
'MAVEN_SNAPSHOT': 'https://oss.sonatype.org/content/repositories/snapshots', '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): def testKnownRedirect(self):
url = resolve_url('MAVEN_CENTRAL:foo.jar', url = resolve_url('MAVEN_CENTRAL:foo.jar',
{'MAVEN_CENTRAL': 'http://my.company.mirror/maven2'}) {'MAVEN_CENTRAL': 'https://my.company.mirror/maven2'})
self.assertEqual(url, 'http://my.company.mirror/maven2/foo.jar') self.assertEqual(url, 'https://my.company.mirror/maven2/foo.jar')
def testCustom(self): def testCustom(self):
url = resolve_url('http://maven.example.com/release/foo.jar', {}) url = resolve_url('https://maven.example.com/release/foo.jar', {})
self.assertEqual(url, 'http://maven.example.com/release/foo.jar') self.assertEqual(url, 'https://maven.example.com/release/foo.jar')
def testCustomRedirect(self): def testCustomRedirect(self):
url = resolve_url('MAVEN_EXAMPLE:foo.jar', url = resolve_url('MAVEN_EXAMPLE:foo.jar',
{'MAVEN_EXAMPLE': {'MAVEN_EXAMPLE':
'http://maven.example.com/release'}) 'https://maven.example.com/release'})
self.assertEqual(url, 'http://maven.example.com/release/foo.jar') self.assertEqual(url, 'https://maven.example.com/release/foo.jar')
if __name__ == '__main__': if __name__ == '__main__':