diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-01-11 09:17:55 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-01-11 09:17:55 +0900 |
| commit | a32ed26e9a7dcc22bd9d333a90ba561044053853 (patch) | |
| tree | b269e08dc752776cf246f8c54f94dc804292b5c0 /tools | |
| parent | 08b73187f588a47e5aa41c2da5d4920dbe4e1127 (diff) | |
| parent | d40709c77773a863077e07dc3ad82db0a4d7a49f (diff) | |
Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Set version to 2.15.8
Upgrade JGit to 4.9.8.201812241815-r
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: I012c25d49b9c03e91404c3166f30fdb7f32810f5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bzl/maven_jar.bzl | 2 | ||||
| -rw-r--r-- | tools/util.py | 13 |
2 files changed, 8 insertions, 7 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 45d05419ec..172ecfe521 100644 --- a/tools/util.py +++ b/tools/util.py @@ -15,13 +15,12 @@ from os import path REPO_ROOTS = { - 'GERRIT': 'http://gerrit-maven.storage.googleapis.com', - 'GERRIT_API': - 'https://gerrit-api.commondatastorage.googleapis.com/release', - 'MAVEN_CENTRAL': 'http://repo1.maven.org/maven2', - 'MAVEN_LOCAL': 'file://' + path.expanduser('~/.m2/repository'), - 'MAVEN_SNAPSHOT': - 'https://oss.sonatype.org/content/repositories/snapshots', + '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', + 'MAVEN_LOCAL': 'file://' + path.expanduser('~/.m2/repository'), + 'MAVEN_SNAPSHOT': 'https://oss.sonatype.org/content/repositories/snapshots', } |