diff options
author | David Pursehouse <dpursehouse@collab.net> | 2019-01-11 09:11:00 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2019-01-11 09:11:00 +0900 |
commit | c3a647653b9520cbc819c7760bb684d22c968a53 (patch) | |
tree | bf2041e93979de3b0a88671365ed9fefe95138d7 /tools | |
parent | 402e8353a0265f4bc428adc34017c80d396c3ed0 (diff) | |
parent | 2cc0e17c1ca164ef223ac06c09357aa3571c38b6 (diff) |
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Set version to 2.14.18
Revert "Fix the missing DB entry in Gerrit DB"
Upgrade JGit to 4.7.7.201812240805-r
maven_jar: Add repo.eclipse.org to supported repositories
Upgrade JGit to 4.5.5.201812240535-r
Change-Id: I69dca6c1f942de80b3c77c125b561ae33de8abaa
Diffstat (limited to 'tools')
-rw-r--r-- | tools/bzl/maven_jar.bzl | 2 | ||||
-rw-r--r-- | tools/util.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl index 05f18bd14a..821e037687 100644 --- a/tools/bzl/maven_jar.bzl +++ b/tools/bzl/maven_jar.bzl @@ -6,6 +6,8 @@ MAVEN_CENTRAL = "MAVEN_CENTRAL:" MAVEN_LOCAL = "MAVEN_LOCAL:" +ECLIPSE = "ECLIPSE:" + def _maven_release(ctx, parts): """induce jar and url name from maven coordinates.""" if len(parts) not in [3, 4]: diff --git a/tools/util.py b/tools/util.py index e8182ed9d8..0967f1b539 100644 --- a/tools/util.py +++ b/tools/util.py @@ -15,6 +15,7 @@ from os import path REPO_ROOTS = { + 'ECLIPSE': 'https://repo.eclipse.org/content/groups/releases', 'GERRIT': 'http://gerrit-maven.storage.googleapis.com', 'GERRIT_API': 'https://gerrit-api.commondatastorage.googleapis.com/release', 'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2', |