Convert http links to https
Change-Id: Ie71bb378917b7270eb19d6aaaf043f6b139b10d0
This commit is contained in:
		@@ -4,7 +4,7 @@ _JGIT_VERS = "4.7.9.201904161809-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.
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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",
 | 
			
		||||
 
 | 
			
		||||
@@ -48,7 +48,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)
 | 
			
		||||
 
 | 
			
		||||
@@ -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',
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -23,21 +23,21 @@ class TestResolveUrl(unittest.TestCase):
 | 
			
		||||
 | 
			
		||||
  def testKnown(self):
 | 
			
		||||
    url = resolve_url('GERRIT:foo.jar', {})
 | 
			
		||||
    self.assertEqual(url, 'http://gerrit-maven.storage.googleapis.com/foo.jar')
 | 
			
		||||
    self.assertEqual(url, 'https://gerrit-maven.storage.googleapis.com/foo.jar')
 | 
			
		||||
 | 
			
		||||
  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')
 | 
			
		||||
                      {'MAVEN_EXAMPLE': 'https://maven.example.com/release'})
 | 
			
		||||
    self.assertEqual(url, 'https://maven.example.com/release/foo.jar')
 | 
			
		||||
 | 
			
		||||
if __name__ == '__main__':
 | 
			
		||||
  unittest.main()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user