diff options
| author | Luca Milanesio <luca.milanesio@gmail.com> | 2019-01-10 22:03:57 +0000 |
|---|---|---|
| committer | Luca Milanesio <luca.milanesio@gmail.com> | 2019-01-10 22:04:11 +0000 |
| commit | 08dd052d75161a1e3d5a4eff39e0334ab46f148a (patch) | |
| tree | 640e851f4fe2d21485cd92b077058a39b76aad52 | |
| parent | 591d3557640c665d6303f43bb6036ed085a6bd38 (diff) | |
| parent | 043b1019ce500bf077c678b9140a08f4a9bc1fc1 (diff) | |
Merge branch 'stable-2.11' into stable-2.12
* stable-2.11:
Upgrade JGit to 4.5.5.201812240535-r
Change-Id: I2f3bce590b9ddbd3a66ae070c125680ea8243eca
| -rw-r--r-- | lib/jgit/BUCK | 14 | ||||
| -rw-r--r-- | lib/maven.defs | 1 | ||||
| -rw-r--r-- | tools/util.py | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/jgit/BUCK b/lib/jgit/BUCK index a7c19de514..b5708a86af 100644 --- a/lib/jgit/BUCK +++ b/lib/jgit/BUCK @@ -1,13 +1,13 @@ include_defs('//lib/maven.defs') -REPO = MAVEN_CENTRAL # Leave here even if set to MAVEN_CENTRAL. -VERS = '4.5.4.201711221230-r' +REPO = ECLIPSE # Leave here even if set to MAVEN_CENTRAL. +VERS = '4.5.5.201812240535-r' maven_jar( name = 'jgit', id = 'org.eclipse.jgit:org.eclipse.jgit:' + VERS, - bin_sha1 = 'b30f322c7d441260f4fa454ce5de65cf7e961274', - src_sha1 = '459f648f8bbf10e1aa0b122d4f9919e1779922e9', + bin_sha1 = '1dac8dd7deb4ec72939fe30cd6fd57c22fd4a403', + src_sha1 = '6c5fe5a2bd6b12571d15984916463f2f28223a93', license = 'jgit', repository = REPO, unsign = True, @@ -22,7 +22,7 @@ maven_jar( maven_jar( name = 'jgit-servlet', id = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + VERS, - sha1 = '264fac29b6007146127156113ed3d4e0aa922b39', + sha1 = '6498fa4f4bd5db11d3069952540b68a9aef024c2', license = 'jgit', repository = REPO, deps = [':jgit'], @@ -36,7 +36,7 @@ maven_jar( maven_jar( name = 'jgit-archive', id = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + VERS, - sha1 = '6b0b919ee42bf8276193c3c03581634bc3aa7e18', + sha1 = 'd64327d788ae43d79eb4e42d2432646c7b485789', license = 'jgit', repository = REPO, deps = [':jgit', @@ -53,7 +53,7 @@ maven_jar( maven_jar( name = 'junit', id = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + VERS, - sha1 = '58ca0a0fba72f2db6e6b27bd464dc44a946a617c', + sha1 = '50c36e367e7df961c1acc9308b7d52ea21a73d91', license = 'DO_NOT_DISTRIBUTE', repository = REPO, unsign = True, diff --git a/lib/maven.defs b/lib/maven.defs index 5c29beda36..665d39c2f2 100644 --- a/lib/maven.defs +++ b/lib/maven.defs @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +ECLIPSE = 'ECLIPSE:' GERRIT = 'GERRIT:' GERRIT_API = 'GERRIT_API:' MAVEN_CENTRAL = 'MAVEN_CENTRAL:' diff --git a/tools/util.py b/tools/util.py index ec895dddfa..1e9b223996 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', |