Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Use now mandatory https protocol for MAVEN_CENTRAL
Prevently use https also for similar urls in tools/js.bzl.
Change-Id: I402590cd57d0d796710caf7d0d60a82eb8af3b4e
diff --git a/tools/js.bzl b/tools/js.bzl
index decb331..21cfa73 100644
--- a/tools/js.bzl
+++ b/tools/js.bzl
@@ -20,9 +20,9 @@
dest = ctx.path(base)
repository = ctx.attr.repository
if repository == GERRIT:
- url = "http://gerrit-maven.storage.googleapis.com/npm-packages/%s" % filename
+ url = "https://gerrit-maven.storage.googleapis.com/npm-packages/%s" % filename
elif repository == NPMJS:
- url = "http://registry.npmjs.org/%s/-/%s" % (name, filename)
+ url = "https://registry.npmjs.org/%s/-/%s" % (name, filename)
else:
fail("repository %s not in {%s,%s}" % (repository, GERRIT, NPMJS))
diff --git a/tools/util.py b/tools/util.py
index e8182ed..1d92528 100644
--- a/tools/util.py
+++ b/tools/util.py
@@ -15,9 +15,9 @@
from os import path
REPO_ROOTS = {
- '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',
}
